diff --git a/.gitmodules b/.gitmodules index 0d73816e3..7098d9d08 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "libultraship"] path = libultraship url = https://github.com/kenix3/libultraship.git +[submodule "ZAPDTR"] + path = ZAPDTR + url = https://github.com/harbourmasters/ZAPDTR +[submodule "OTRExporter"] + path = OTRExporter + url = https://github.com/harbourmasters/OTRExporter 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 855b9da3d..0633ab80a 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.0 LANGUAGES C CXX) +set(PROJECT_BUILD_NAME "MacReady Alfa" CACHE STRING "") set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "") set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh) @@ -97,7 +97,7 @@ set_property(TARGET soh PROPERTY APPIMAGE_DESKTOP_FILE "${CMAKE_SOURCE_DIR}/scri set_property(TARGET soh PROPERTY APPIMAGE_ICON_FILE "${CMAKE_BINARY_DIR}/sohIcon.png") if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") -install(PROGRAMS "${CMAKE_SOURCE_DIR}/scripts/linux/appimage/soh.sh" DESTINATION . COMPONENT appimage) +install(PROGRAMS "${CMAKE_BINARY_DIR}/linux/soh.sh" DESTINATION . COMPONENT appimage) install(FILES "${CMAKE_SOURCE_DIR}/soh.otr" DESTINATION . COMPONENT ship) install(TARGETS ZAPD DESTINATION ./assets/extractor COMPONENT extractor) install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/extractor COMPONENT extractor) @@ -108,6 +108,15 @@ install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_OoTMqDbg.txt" DEST install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT extractor) endif() +if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") +install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/extractor COMPONENT ship) +install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/xml/" DESTINATION ./assets/extractor/xmls COMPONENT ship) +install(DIRECTORY "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/filelists/" DESTINATION ./assets/extractor/filelists COMPONENT ship) +install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ActorList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship) +install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/ObjectList_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship) +install(FILES "${CMAKE_SOURCE_DIR}/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt" DESTINATION ./assets/extractor/symbols COMPONENT ship) +endif() + find_package(Python3 COMPONENTS Interpreter) # Target to generate OTRs @@ -115,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 + 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..." @@ -126,7 +135,7 @@ add_custom_target( # Target to generate headers add_custom_target( ExtractAssetHeaders - COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$" --non-interactive --gen-headers + COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$" --non-interactive --xml-root ../soh/assets/xml --gen-headers WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter COMMENT "Generating asset headers..." DEPENDS ZAPD @@ -137,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 + 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..." @@ -210,4 +219,4 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin") endif() set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_SOURCE_DIR}/CMake/Packaging-2.cmake) -include(CMake/Packaging.cmake) \ No newline at end of file +include(CMake/Packaging.cmake) diff --git a/OTRExporter b/OTRExporter new file mode 160000 index 000000000..0d8f5570a --- /dev/null +++ b/OTRExporter @@ -0,0 +1 @@ +Subproject commit 0d8f5570a8e57f302ec6633d65615ee21ab39454 diff --git a/OTRExporter/.gitignore b/OTRExporter/.gitignore deleted file mode 100644 index 2080ab480..000000000 --- a/OTRExporter/.gitignore +++ /dev/null @@ -1,353 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ -**/Properties/launchSettings.json - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -*.out -*.o -*.d -lib/libgfxd/libgfxd.a -ExporterTest/ExporterTest.a -ZAPDUtils/ZAPDUtils.a -.vscode/ -build/ -ZAPDUtils/build/ -ZAPD/BuildInfo.h -baserom/ -baserom_ntsc/ -*.vtx.inc -*.otr -*.swp -*.a -*.z64 -*.n64 -Extract/ - -tmp.txt diff --git a/OTRExporter/.gitrepo b/OTRExporter/.gitrepo deleted file mode 100644 index 80e147d0c..000000000 --- a/OTRExporter/.gitrepo +++ /dev/null @@ -1,12 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme -; -[subrepo] - remote = https://github.com/HarbourMasters/OTRExporter.git - branch = master - commit = 1503d3eefa0b51164371c60c2aae8ad057678319 - parent = d24c8453db1035f382e1b0853be00ebd281bbbdd - method = rebase - cmdver = 0.4.1 diff --git a/OTRExporter/CFG/ActorList_OoTMqDbg.txt b/OTRExporter/CFG/ActorList_OoTMqDbg.txt deleted file mode 100644 index a0395eb27..000000000 --- a/OTRExporter/CFG/ActorList_OoTMqDbg.txt +++ /dev/null @@ -1,472 +0,0 @@ -ACTOR_PLAYER -ACTOR_UNSET_1 -ACTOR_EN_TEST -ACTOR_UNSET_3 -ACTOR_EN_GIRLA -ACTOR_UNSET_5 -ACTOR_UNSET_6 -ACTOR_EN_PART -ACTOR_EN_LIGHT -ACTOR_EN_DOOR -ACTOR_EN_BOX -ACTOR_BG_DY_YOSEIZO -ACTOR_BG_HIDAN_FIREWALL -ACTOR_EN_POH -ACTOR_EN_OKUTA -ACTOR_BG_YDAN_SP -ACTOR_EN_BOM -ACTOR_EN_WALLMAS -ACTOR_EN_DODONGO -ACTOR_EN_FIREFLY -ACTOR_EN_HORSE -ACTOR_EN_ITEM00 -ACTOR_EN_ARROW -ACTOR_UNSET_17 -ACTOR_EN_ELF -ACTOR_EN_NIW -ACTOR_UNSET_1A -ACTOR_EN_TITE -ACTOR_EN_REEBA -ACTOR_EN_PEEHAT -ACTOR_EN_BUTTE -ACTOR_UNSET_1F -ACTOR_EN_INSECT -ACTOR_EN_FISH -ACTOR_UNSET_22 -ACTOR_EN_HOLL -ACTOR_EN_SCENE_CHANGE -ACTOR_EN_ZF -ACTOR_EN_HATA -ACTOR_BOSS_DODONGO -ACTOR_BOSS_GOMA -ACTOR_EN_ZL1 -ACTOR_EN_VIEWER -ACTOR_EN_GOMA -ACTOR_BG_PUSHBOX -ACTOR_EN_BUBBLE -ACTOR_DOOR_SHUTTER -ACTOR_EN_DODOJR -ACTOR_EN_BDFIRE -ACTOR_UNSET_31 -ACTOR_EN_BOOM -ACTOR_EN_TORCH2 -ACTOR_EN_BILI -ACTOR_EN_TP -ACTOR_UNSET_36 -ACTOR_EN_ST -ACTOR_EN_BW -ACTOR_EN_A_OBJ -ACTOR_EN_EIYER -ACTOR_EN_RIVER_SOUND -ACTOR_EN_HORSE_NORMAL -ACTOR_EN_OSSAN -ACTOR_BG_TREEMOUTH -ACTOR_BG_DODOAGO -ACTOR_BG_HIDAN_DALM -ACTOR_BG_HIDAN_HROCK -ACTOR_EN_HORSE_GANON -ACTOR_BG_HIDAN_ROCK -ACTOR_BG_HIDAN_RSEKIZOU -ACTOR_BG_HIDAN_SEKIZOU -ACTOR_BG_HIDAN_SIMA -ACTOR_BG_HIDAN_SYOKU -ACTOR_EN_XC -ACTOR_BG_HIDAN_CURTAIN -ACTOR_BG_SPOT00_HANEBASI -ACTOR_EN_MB -ACTOR_EN_BOMBF -ACTOR_EN_ZL2 -ACTOR_BG_HIDAN_FSLIFT -ACTOR_EN_OE2 -ACTOR_BG_YDAN_HASI -ACTOR_BG_YDAN_MARUTA -ACTOR_BOSS_GANONDROF -ACTOR_UNSET_53 -ACTOR_EN_AM -ACTOR_EN_DEKUBABA -ACTOR_EN_M_FIRE1 -ACTOR_EN_M_THUNDER -ACTOR_BG_DDAN_JD -ACTOR_BG_BREAKWALL -ACTOR_EN_JJ -ACTOR_EN_HORSE_ZELDA -ACTOR_BG_DDAN_KD -ACTOR_DOOR_WARP1 -ACTOR_OBJ_SYOKUDAI -ACTOR_ITEM_B_HEART -ACTOR_EN_DEKUNUTS -ACTOR_BG_MENKURI_KAITEN -ACTOR_BG_MENKURI_EYE -ACTOR_EN_VALI -ACTOR_BG_MIZU_MOVEBG -ACTOR_BG_MIZU_WATER -ACTOR_ARMS_HOOK -ACTOR_EN_FHG -ACTOR_BG_MORI_HINERI -ACTOR_EN_BB -ACTOR_BG_TOKI_HIKARI -ACTOR_EN_YUKABYUN -ACTOR_BG_TOKI_SWD -ACTOR_EN_FHG_FIRE -ACTOR_BG_MJIN -ACTOR_BG_HIDAN_KOUSI -ACTOR_DOOR_TOKI -ACTOR_BG_HIDAN_HAMSTEP -ACTOR_EN_BIRD -ACTOR_UNSET_73 -ACTOR_UNSET_74 -ACTOR_UNSET_75 -ACTOR_UNSET_76 -ACTOR_EN_WOOD02 -ACTOR_UNSET_78 -ACTOR_UNSET_79 -ACTOR_UNSET_7A -ACTOR_UNSET_7B -ACTOR_EN_LIGHTBOX -ACTOR_EN_PU_BOX -ACTOR_UNSET_7E -ACTOR_UNSET_7F -ACTOR_EN_TRAP -ACTOR_EN_AROW_TRAP -ACTOR_EN_VASE -ACTOR_UNSET_83 -ACTOR_EN_TA -ACTOR_EN_TK -ACTOR_BG_MORI_BIGST -ACTOR_BG_MORI_ELEVATOR -ACTOR_BG_MORI_KAITENKABE -ACTOR_BG_MORI_RAKKATENJO -ACTOR_EN_VM -ACTOR_DEMO_EFFECT -ACTOR_DEMO_KANKYO -ACTOR_BG_HIDAN_FWBIG -ACTOR_EN_FLOORMAS -ACTOR_EN_HEISHI1 -ACTOR_EN_RD -ACTOR_EN_PO_SISTERS -ACTOR_BG_HEAVY_BLOCK -ACTOR_BG_PO_EVENT -ACTOR_OBJ_MURE -ACTOR_EN_SW -ACTOR_BOSS_FD -ACTOR_OBJECT_KANKYO -ACTOR_EN_DU -ACTOR_EN_FD -ACTOR_EN_HORSE_LINK_CHILD -ACTOR_DOOR_ANA -ACTOR_BG_SPOT02_OBJECTS -ACTOR_BG_HAKA -ACTOR_MAGIC_WIND -ACTOR_MAGIC_FIRE -ACTOR_UNSET_A0 -ACTOR_EN_RU1 -ACTOR_BOSS_FD2 -ACTOR_EN_FD_FIRE -ACTOR_EN_DH -ACTOR_EN_DHA -ACTOR_EN_RL -ACTOR_EN_ENCOUNT1 -ACTOR_DEMO_DU -ACTOR_DEMO_IM -ACTOR_DEMO_TRE_LGT -ACTOR_EN_FW -ACTOR_BG_VB_SIMA -ACTOR_EN_VB_BALL -ACTOR_BG_HAKA_MEGANE -ACTOR_BG_HAKA_MEGANEBG -ACTOR_BG_HAKA_SHIP -ACTOR_BG_HAKA_SGAMI -ACTOR_UNSET_B2 -ACTOR_EN_HEISHI2 -ACTOR_EN_ENCOUNT2 -ACTOR_EN_FIRE_ROCK -ACTOR_EN_BROB -ACTOR_MIR_RAY -ACTOR_BG_SPOT09_OBJ -ACTOR_BG_SPOT18_OBJ -ACTOR_BOSS_VA -ACTOR_BG_HAKA_TUBO -ACTOR_BG_HAKA_TRAP -ACTOR_BG_HAKA_HUTA -ACTOR_BG_HAKA_ZOU -ACTOR_BG_SPOT17_FUNEN -ACTOR_EN_SYATEKI_ITM -ACTOR_EN_SYATEKI_MAN -ACTOR_EN_TANA -ACTOR_EN_NB -ACTOR_BOSS_MO -ACTOR_EN_SB -ACTOR_EN_BIGOKUTA -ACTOR_EN_KAREBABA -ACTOR_BG_BDAN_OBJECTS -ACTOR_DEMO_SA -ACTOR_DEMO_GO -ACTOR_EN_IN -ACTOR_EN_TR -ACTOR_BG_SPOT16_BOMBSTONE -ACTOR_UNSET_CE -ACTOR_BG_HIDAN_KOWARERUKABE -ACTOR_BG_BOMBWALL -ACTOR_BG_SPOT08_ICEBLOCK -ACTOR_EN_RU2 -ACTOR_OBJ_DEKUJR -ACTOR_BG_MIZU_UZU -ACTOR_BG_SPOT06_OBJECTS -ACTOR_BG_ICE_OBJECTS -ACTOR_BG_HAKA_WATER -ACTOR_UNSET_D8 -ACTOR_EN_MA2 -ACTOR_EN_BOM_CHU -ACTOR_EN_HORSE_GAME_CHECK -ACTOR_BOSS_TW -ACTOR_EN_RR -ACTOR_EN_BA -ACTOR_EN_BX -ACTOR_EN_ANUBICE -ACTOR_EN_ANUBICE_FIRE -ACTOR_BG_MORI_HASHIGO -ACTOR_BG_MORI_HASHIRA4 -ACTOR_BG_MORI_IDOMIZU -ACTOR_BG_SPOT16_DOUGHNUT -ACTOR_BG_BDAN_SWITCH -ACTOR_EN_MA1 -ACTOR_BOSS_GANON -ACTOR_BOSS_SST -ACTOR_UNSET_EA -ACTOR_UNSET_EB -ACTOR_EN_NY -ACTOR_EN_FR -ACTOR_ITEM_SHIELD -ACTOR_BG_ICE_SHELTER -ACTOR_EN_ICE_HONO -ACTOR_ITEM_OCARINA -ACTOR_UNSET_F2 -ACTOR_UNSET_F3 -ACTOR_MAGIC_DARK -ACTOR_DEMO_6K -ACTOR_EN_ANUBICE_TAG -ACTOR_BG_HAKA_GATE -ACTOR_BG_SPOT15_SAKU -ACTOR_BG_JYA_GOROIWA -ACTOR_BG_JYA_ZURERUKABE -ACTOR_UNSET_FB -ACTOR_BG_JYA_COBRA -ACTOR_BG_JYA_KANAAMI -ACTOR_FISHING -ACTOR_OBJ_OSHIHIKI -ACTOR_BG_GATE_SHUTTER -ACTOR_EFF_DUST -ACTOR_BG_SPOT01_FUSYA -ACTOR_BG_SPOT01_IDOHASHIRA -ACTOR_BG_SPOT01_IDOMIZU -ACTOR_BG_PO_SYOKUDAI -ACTOR_BG_GANON_OTYUKA -ACTOR_BG_SPOT15_RRBOX -ACTOR_BG_UMAJUMP -ACTOR_UNSET_109 -ACTOR_ARROW_FIRE -ACTOR_ARROW_ICE -ACTOR_ARROW_LIGHT -ACTOR_UNSET_10D -ACTOR_UNSET_10E -ACTOR_ITEM_ETCETERA -ACTOR_OBJ_KIBAKO -ACTOR_OBJ_TSUBO -ACTOR_EN_WONDER_ITEM -ACTOR_EN_IK -ACTOR_DEMO_IK -ACTOR_EN_SKJ -ACTOR_EN_SKJNEEDLE -ACTOR_EN_G_SWITCH -ACTOR_DEMO_EXT -ACTOR_DEMO_SHD -ACTOR_EN_DNS -ACTOR_ELF_MSG -ACTOR_EN_HONOTRAP -ACTOR_EN_TUBO_TRAP -ACTOR_OBJ_ICE_POLY -ACTOR_BG_SPOT03_TAKI -ACTOR_BG_SPOT07_TAKI -ACTOR_EN_FZ -ACTOR_EN_PO_RELAY -ACTOR_BG_RELAY_OBJECTS -ACTOR_EN_DIVING_GAME -ACTOR_EN_KUSA -ACTOR_OBJ_BEAN -ACTOR_OBJ_BOMBIWA -ACTOR_UNSET_128 -ACTOR_UNSET_129 -ACTOR_OBJ_SWITCH -ACTOR_OBJ_ELEVATOR -ACTOR_OBJ_LIFT -ACTOR_OBJ_HSBLOCK -ACTOR_EN_OKARINA_TAG -ACTOR_EN_YABUSAME_MARK -ACTOR_EN_GOROIWA -ACTOR_EN_EX_RUPPY -ACTOR_EN_TORYO -ACTOR_EN_DAIKU -ACTOR_UNSET_134 -ACTOR_EN_NWC -ACTOR_EN_BLKOBJ -ACTOR_ITEM_INBOX -ACTOR_EN_GE1 -ACTOR_OBJ_BLOCKSTOP -ACTOR_EN_SDA -ACTOR_EN_CLEAR_TAG -ACTOR_EN_NIW_LADY -ACTOR_EN_GM -ACTOR_EN_MS -ACTOR_EN_HS -ACTOR_BG_INGATE -ACTOR_EN_KANBAN -ACTOR_EN_HEISHI3 -ACTOR_EN_SYATEKI_NIW -ACTOR_EN_ATTACK_NIW -ACTOR_BG_SPOT01_IDOSOKO -ACTOR_EN_SA -ACTOR_EN_WONDER_TALK -ACTOR_BG_GJYO_BRIDGE -ACTOR_EN_DS -ACTOR_EN_MK -ACTOR_EN_BOM_BOWL_MAN -ACTOR_EN_BOM_BOWL_PIT -ACTOR_EN_OWL -ACTOR_EN_ISHI -ACTOR_OBJ_HANA -ACTOR_OBJ_LIGHTSWITCH -ACTOR_OBJ_MURE2 -ACTOR_EN_GO -ACTOR_EN_FU -ACTOR_UNSET_154 -ACTOR_EN_CHANGER -ACTOR_BG_JYA_MEGAMI -ACTOR_BG_JYA_LIFT -ACTOR_BG_JYA_BIGMIRROR -ACTOR_BG_JYA_BOMBCHUIWA -ACTOR_BG_JYA_AMISHUTTER -ACTOR_BG_JYA_BOMBIWA -ACTOR_BG_SPOT18_BASKET -ACTOR_UNSET_15D -ACTOR_EN_GANON_ORGAN -ACTOR_EN_SIOFUKI -ACTOR_EN_STREAM -ACTOR_UNSET_161 -ACTOR_EN_MM -ACTOR_EN_KO -ACTOR_EN_KZ -ACTOR_EN_WEATHER_TAG -ACTOR_BG_SST_FLOOR -ACTOR_EN_ANI -ACTOR_EN_EX_ITEM -ACTOR_BG_JYA_IRONOBJ -ACTOR_EN_JS -ACTOR_EN_JSJUTAN -ACTOR_EN_CS -ACTOR_EN_MD -ACTOR_EN_HY -ACTOR_EN_GANON_MANT -ACTOR_EN_OKARINA_EFFECT -ACTOR_EN_MAG -ACTOR_DOOR_GERUDO -ACTOR_ELF_MSG2 -ACTOR_DEMO_GT -ACTOR_EN_PO_FIELD -ACTOR_EFC_ERUPC -ACTOR_BG_ZG -ACTOR_EN_HEISHI4 -ACTOR_EN_ZL3 -ACTOR_BOSS_GANON2 -ACTOR_EN_KAKASI -ACTOR_EN_TAKARA_MAN -ACTOR_OBJ_MAKEOSHIHIKI -ACTOR_OCEFF_SPOT -ACTOR_END_TITLE -ACTOR_UNSET_180 -ACTOR_EN_TORCH -ACTOR_DEMO_EC -ACTOR_SHOT_SUN -ACTOR_EN_DY_EXTRA -ACTOR_EN_WONDER_TALK2 -ACTOR_EN_GE2 -ACTOR_OBJ_ROOMTIMER -ACTOR_EN_SSH -ACTOR_EN_STH -ACTOR_OCEFF_WIPE -ACTOR_OCEFF_STORM -ACTOR_EN_WEIYER -ACTOR_BG_SPOT05_SOKO -ACTOR_BG_JYA_1FLIFT -ACTOR_BG_JYA_HAHENIRON -ACTOR_BG_SPOT12_GATE -ACTOR_BG_SPOT12_SAKU -ACTOR_EN_HINTNUTS -ACTOR_EN_NUTSBALL -ACTOR_BG_SPOT00_BREAK -ACTOR_EN_SHOPNUTS -ACTOR_EN_IT -ACTOR_EN_GELDB -ACTOR_OCEFF_WIPE2 -ACTOR_OCEFF_WIPE3 -ACTOR_EN_NIW_GIRL -ACTOR_EN_DOG -ACTOR_EN_SI -ACTOR_BG_SPOT01_OBJECTS2 -ACTOR_OBJ_COMB -ACTOR_BG_SPOT11_BAKUDANKABE -ACTOR_OBJ_KIBAKO2 -ACTOR_EN_DNT_DEMO -ACTOR_EN_DNT_JIJI -ACTOR_EN_DNT_NOMAL -ACTOR_EN_GUEST -ACTOR_BG_BOM_GUARD -ACTOR_EN_HS2 -ACTOR_DEMO_KEKKAI -ACTOR_BG_SPOT08_BAKUDANKABE -ACTOR_BG_SPOT17_BAKUDANKABE -ACTOR_UNSET_1AA -ACTOR_OBJ_MURE3 -ACTOR_EN_TG -ACTOR_EN_MU -ACTOR_EN_GO2 -ACTOR_EN_WF -ACTOR_EN_SKB -ACTOR_DEMO_GJ -ACTOR_DEMO_GEFF -ACTOR_BG_GND_FIREMEIRO -ACTOR_BG_GND_DARKMEIRO -ACTOR_BG_GND_SOULMEIRO -ACTOR_BG_GND_NISEKABE -ACTOR_BG_GND_ICEBLOCK -ACTOR_EN_GB -ACTOR_EN_GS -ACTOR_BG_MIZU_BWALL -ACTOR_BG_MIZU_SHUTTER -ACTOR_EN_DAIKU_KAKARIKO -ACTOR_BG_BOWL_WALL -ACTOR_EN_WALL_TUBO -ACTOR_EN_PO_DESERT -ACTOR_EN_CROW -ACTOR_DOOR_KILLER -ACTOR_BG_SPOT11_OASIS -ACTOR_BG_SPOT18_FUTA -ACTOR_BG_SPOT18_SHUTTER -ACTOR_EN_MA3 -ACTOR_EN_COW -ACTOR_BG_ICE_TURARA -ACTOR_BG_ICE_SHUTTER -ACTOR_EN_KAKASI2 -ACTOR_EN_KAKASI3 -ACTOR_OCEFF_WIPE4 -ACTOR_EN_EG -ACTOR_BG_MENKURI_NISEKABE -ACTOR_EN_ZO -ACTOR_OBJ_MAKEKINSUTA -ACTOR_EN_GE3 -ACTOR_OBJ_TIMEBLOCK -ACTOR_OBJ_HAMISHI -ACTOR_EN_ZL4 -ACTOR_EN_MM2 -ACTOR_BG_JYA_BLOCK -ACTOR_OBJ_WARP2BLOCK -ACTOR_ID_MAX \ No newline at end of file diff --git a/OTRExporter/CFG/Config.xml b/OTRExporter/CFG/Config.xml deleted file mode 100644 index adec174ca..000000000 --- a/OTRExporter/CFG/Config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/OTRExporter/CFG/ObjectList_OoTMqDbg.txt b/OTRExporter/CFG/ObjectList_OoTMqDbg.txt deleted file mode 100644 index 1ecc3441b..000000000 --- a/OTRExporter/CFG/ObjectList_OoTMqDbg.txt +++ /dev/null @@ -1,402 +0,0 @@ -OBJECT_INVALID -OBJECT_GAMEPLAY_KEEP -OBJECT_GAMEPLAY_FIELD_KEEP -OBJECT_GAMEPLAY_DANGEON_KEEP -OBJECT_UNSET_4 -OBJECT_UNSET_5 -OBJECT_HUMAN -OBJECT_OKUTA -OBJECT_CROW -OBJECT_POH -OBJECT_DY_OBJ -OBJECT_WALLMASTER -OBJECT_DODONGO -OBJECT_FIREFLY -OBJECT_BOX -OBJECT_FIRE -OBJECT_UNSET_10 -OBJECT_UNSET_11 -OBJECT_BUBBLE -OBJECT_NIW -OBJECT_LINK_BOY -OBJECT_LINK_CHILD -OBJECT_TITE -OBJECT_REEBA -OBJECT_PEEHAT -OBJECT_KINGDODONGO -OBJECT_HORSE -OBJECT_ZF -OBJECT_GOMA -OBJECT_ZL1 -OBJECT_GOL -OBJECT_DODOJR -OBJECT_TORCH2 -OBJECT_BL -OBJECT_TP -OBJECT_OA1 -OBJECT_ST -OBJECT_BW -OBJECT_EI -OBJECT_HORSE_NORMAL -OBJECT_OB1 -OBJECT_O_ANIME -OBJECT_SPOT04_OBJECTS -OBJECT_DDAN_OBJECTS -OBJECT_HIDAN_OBJECTS -OBJECT_HORSE_GANON -OBJECT_OA2 -OBJECT_SPOT00_OBJECTS -OBJECT_MB -OBJECT_BOMBF -OBJECT_SK2 -OBJECT_OE1 -OBJECT_OE_ANIME -OBJECT_OE2 -OBJECT_YDAN_OBJECTS -OBJECT_GND -OBJECT_AM -OBJECT_DEKUBABA -OBJECT_UNSET_3A -OBJECT_OA3 -OBJECT_OA4 -OBJECT_OA5 -OBJECT_OA6 -OBJECT_OA7 -OBJECT_JJ -OBJECT_OA8 -OBJECT_OA9 -OBJECT_OB2 -OBJECT_OB3 -OBJECT_OB4 -OBJECT_HORSE_ZELDA -OBJECT_OPENING_DEMO1 -OBJECT_WARP1 -OBJECT_B_HEART -OBJECT_DEKUNUTS -OBJECT_OE3 -OBJECT_OE4 -OBJECT_MENKURI_OBJECTS -OBJECT_OE5 -OBJECT_OE6 -OBJECT_OE7 -OBJECT_OE8 -OBJECT_OE9 -OBJECT_OE10 -OBJECT_OE11 -OBJECT_OE12 -OBJECT_VALI -OBJECT_OA10 -OBJECT_OA11 -OBJECT_MIZU_OBJECTS -OBJECT_FHG -OBJECT_OSSAN -OBJECT_MORI_HINERI1 -OBJECT_BB -OBJECT_TOKI_OBJECTS -OBJECT_YUKABYUN -OBJECT_ZL2 -OBJECT_MJIN -OBJECT_MJIN_FLASH -OBJECT_MJIN_DARK -OBJECT_MJIN_FLAME -OBJECT_MJIN_ICE -OBJECT_MJIN_SOUL -OBJECT_MJIN_WIND -OBJECT_MJIN_OKA -OBJECT_HAKA_OBJECTS -OBJECT_SPOT06_OBJECTS -OBJECT_ICE_OBJECTS -OBJECT_RELAY_OBJECTS -OBJECT_PO_FIELD -OBJECT_PO_COMPOSER -OBJECT_MORI_HINERI1A -OBJECT_MORI_HINERI2 -OBJECT_MORI_HINERI2A -OBJECT_MORI_OBJECTS -OBJECT_MORI_TEX -OBJECT_SPOT08_OBJ -OBJECT_WARP2 -OBJECT_HATA -OBJECT_BIRD -OBJECT_UNSET_78 -OBJECT_UNSET_79 -OBJECT_UNSET_7A -OBJECT_UNSET_7B -OBJECT_WOOD02 -OBJECT_UNSET_7D -OBJECT_UNSET_7E -OBJECT_UNSET_7F -OBJECT_UNSET_80 -OBJECT_LIGHTBOX -OBJECT_PU_BOX -OBJECT_UNSET_83 -OBJECT_UNSET_84 -OBJECT_TRAP -OBJECT_VASE -OBJECT_IM -OBJECT_TA -OBJECT_TK -OBJECT_XC -OBJECT_VM -OBJECT_BV -OBJECT_HAKACH_OBJECTS -OBJECT_EFC_CRYSTAL_LIGHT -OBJECT_EFC_FIRE_BALL -OBJECT_EFC_FLASH -OBJECT_EFC_LGT_SHOWER -OBJECT_EFC_STAR_FIELD -OBJECT_GOD_LGT -OBJECT_LIGHT_RING -OBJECT_TRIFORCE_SPOT -OBJECT_BDAN_OBJECTS -OBJECT_SD -OBJECT_RD -OBJECT_PO_SISTERS -OBJECT_HEAVY_OBJECT -OBJECT_GNDD -OBJECT_FD -OBJECT_DU -OBJECT_FW -OBJECT_MEDAL -OBJECT_HORSE_LINK_CHILD -OBJECT_SPOT02_OBJECTS -OBJECT_HAKA -OBJECT_RU1 -OBJECT_SYOKUDAI -OBJECT_FD2 -OBJECT_DH -OBJECT_RL -OBJECT_EFC_TW -OBJECT_DEMO_TRE_LGT -OBJECT_GI_KEY -OBJECT_MIR_RAY -OBJECT_BROB -OBJECT_GI_JEWEL -OBJECT_SPOT09_OBJ -OBJECT_SPOT18_OBJ -OBJECT_BDOOR -OBJECT_SPOT17_OBJ -OBJECT_SHOP_DUNGEN -OBJECT_NB -OBJECT_MO -OBJECT_SB -OBJECT_GI_MELODY -OBJECT_GI_HEART -OBJECT_GI_COMPASS -OBJECT_GI_BOSSKEY -OBJECT_GI_MEDAL -OBJECT_GI_NUTS -OBJECT_SA -OBJECT_GI_HEARTS -OBJECT_GI_ARROWCASE -OBJECT_GI_BOMBPOUCH -OBJECT_IN -OBJECT_TR -OBJECT_SPOT16_OBJ -OBJECT_OE1S -OBJECT_OE4S -OBJECT_OS_ANIME -OBJECT_GI_BOTTLE -OBJECT_GI_STICK -OBJECT_GI_MAP -OBJECT_OF1D_MAP -OBJECT_RU2 -OBJECT_GI_SHIELD_1 -OBJECT_DEKUJR -OBJECT_GI_MAGICPOT -OBJECT_GI_BOMB_1 -OBJECT_OF1S -OBJECT_MA2 -OBJECT_GI_PURSE -OBJECT_HNI -OBJECT_TW -OBJECT_RR -OBJECT_BXA -OBJECT_ANUBICE -OBJECT_GI_GERUDO -OBJECT_GI_ARROW -OBJECT_GI_BOMB_2 -OBJECT_GI_EGG -OBJECT_GI_SCALE -OBJECT_GI_SHIELD_2 -OBJECT_GI_HOOKSHOT -OBJECT_GI_OCARINA -OBJECT_GI_MILK -OBJECT_MA1 -OBJECT_GANON -OBJECT_SST -OBJECT_NY_UNUSED -OBJECT_UNSET_E4 -OBJECT_NY -OBJECT_FR -OBJECT_GI_PACHINKO -OBJECT_GI_BOOMERANG -OBJECT_GI_BOW -OBJECT_GI_GLASSES -OBJECT_GI_LIQUID -OBJECT_ANI -OBJECT_DEMO_6K -OBJECT_GI_SHIELD_3 -OBJECT_GI_LETTER -OBJECT_SPOT15_OBJ -OBJECT_JYA_OBJ -OBJECT_GI_CLOTHES -OBJECT_GI_BEAN -OBJECT_GI_FISH -OBJECT_GI_SAW -OBJECT_GI_HAMMER -OBJECT_GI_GRASS -OBJECT_GI_LONGSWORD -OBJECT_SPOT01_OBJECTS -OBJECT_MD_UNUSED -OBJECT_MD -OBJECT_KM1 -OBJECT_KW1 -OBJECT_ZO -OBJECT_KZ -OBJECT_UMAJUMP -OBJECT_MASTERKOKIRI -OBJECT_MASTERKOKIRIHEAD -OBJECT_MASTERGOLON -OBJECT_MASTERZOORA -OBJECT_AOB -OBJECT_IK -OBJECT_AHG -OBJECT_CNE -OBJECT_GI_NIWATORI -OBJECT_SKJ -OBJECT_GI_BOTTLE_LETTER -OBJECT_BJI -OBJECT_BBA -OBJECT_GI_OCARINA_0 -OBJECT_DS -OBJECT_ANE -OBJECT_BOJ -OBJECT_SPOT03_OBJECT -OBJECT_SPOT07_OBJECT -OBJECT_FZ -OBJECT_BOB -OBJECT_GE1 -OBJECT_YABUSAME_POINT -OBJECT_GI_BOOTS_2 -OBJECT_GI_SEED -OBJECT_GND_MAGIC -OBJECT_D_ELEVATOR -OBJECT_D_HSBLOCK -OBJECT_D_LIFT -OBJECT_MAMENOKI -OBJECT_GOROIWA -OBJECT_UNSET_120 -OBJECT_TORYO -OBJECT_DAIKU -OBJECT_UNSET_123 -OBJECT_NWC -OBJECT_BLKOBJ -OBJECT_GM -OBJECT_MS -OBJECT_HS -OBJECT_INGATE -OBJECT_LIGHTSWITCH -OBJECT_KUSA -OBJECT_TSUBO -OBJECT_GI_GLOVES -OBJECT_GI_COIN -OBJECT_KANBAN -OBJECT_GJYO_OBJECTS -OBJECT_OWL -OBJECT_MK -OBJECT_FU -OBJECT_GI_KI_TAN_MASK -OBJECT_GI_REDEAD_MASK -OBJECT_GI_SKJ_MASK -OBJECT_GI_RABIT_MASK -OBJECT_GI_TRUTH_MASK -OBJECT_GANON_OBJECTS -OBJECT_SIOFUKI -OBJECT_STREAM -OBJECT_MM -OBJECT_FA -OBJECT_OS -OBJECT_GI_EYE_LOTION -OBJECT_GI_POWDER -OBJECT_GI_MUSHROOM -OBJECT_GI_TICKETSTONE -OBJECT_GI_BROKENSWORD -OBJECT_JS -OBJECT_CS -OBJECT_GI_PRESCRIPTION -OBJECT_GI_BRACELET -OBJECT_GI_SOLDOUT -OBJECT_GI_FROG -OBJECT_MAG -OBJECT_DOOR_GERUDO -OBJECT_GT -OBJECT_EFC_ERUPC -OBJECT_ZL2_ANIME1 -OBJECT_ZL2_ANIME2 -OBJECT_GI_GOLONMASK -OBJECT_GI_ZORAMASK -OBJECT_GI_GERUDOMASK -OBJECT_GANON2 -OBJECT_KA -OBJECT_TS -OBJECT_ZG -OBJECT_GI_HOVERBOOTS -OBJECT_GI_M_ARROW -OBJECT_DS2 -OBJECT_EC -OBJECT_FISH -OBJECT_GI_SUTARU -OBJECT_GI_GODDESS -OBJECT_SSH -OBJECT_BIGOKUTA -OBJECT_BG -OBJECT_SPOT05_OBJECTS -OBJECT_SPOT12_OBJ -OBJECT_BOMBIWA -OBJECT_HINTNUTS -OBJECT_RS -OBJECT_SPOT00_BREAK -OBJECT_GLA -OBJECT_SHOPNUTS -OBJECT_GELDB -OBJECT_GR -OBJECT_DOG -OBJECT_JYA_IRON -OBJECT_JYA_DOOR -OBJECT_UNSET_16E -OBJECT_SPOT11_OBJ -OBJECT_KIBAKO2 -OBJECT_DNS -OBJECT_DNK -OBJECT_GI_FIRE -OBJECT_GI_INSECT -OBJECT_GI_BUTTERFLY -OBJECT_GI_GHOST -OBJECT_GI_SOUL -OBJECT_BOWL -OBJECT_DEMO_KEKKAI -OBJECT_EFC_DOUGHNUT -OBJECT_GI_DEKUPOUCH -OBJECT_GANON_ANIME1 -OBJECT_GANON_ANIME2 -OBJECT_GANON_ANIME3 -OBJECT_GI_RUPY -OBJECT_SPOT01_MATOYA -OBJECT_SPOT01_MATOYAB -OBJECT_MU -OBJECT_WF -OBJECT_SKB -OBJECT_GJ -OBJECT_GEFF -OBJECT_HAKA_DOOR -OBJECT_GS -OBJECT_PS -OBJECT_BWALL -OBJECT_COW -OBJECT_COB -OBJECT_GI_SWORD_1 -OBJECT_DOOR_KILLER -OBJECT_OUKE_HAKA -OBJECT_TIMEBLOCK -OBJECT_ZL4 \ No newline at end of file diff --git a/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt b/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt deleted file mode 100644 index 015e7e88a..000000000 --- a/OTRExporter/CFG/SymbolMap_OoTMqDbg.txt +++ /dev/null @@ -1 +0,0 @@ -8012DB20 gMtxClear \ No newline at end of file diff --git a/OTRExporter/CFG/TexturePool.xml b/OTRExporter/CFG/TexturePool.xml deleted file mode 100644 index 924ded703..000000000 --- a/OTRExporter/CFG/TexturePool.xml +++ /dev/null @@ -1,952 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OTRExporter/CFG/filelists/dbg.txt b/OTRExporter/CFG/filelists/dbg.txt deleted file mode 100644 index 68af5e557..000000000 --- a/OTRExporter/CFG/filelists/dbg.txt +++ /dev/null @@ -1,1532 +0,0 @@ -makerom -boot -dmadata -Audiobank -Audioseq -Audiotable -link_animetion -icon_item_static -icon_item_24_static -icon_item_field_static -icon_item_dungeon_static -icon_item_gameover_static -icon_item_nes_static -icon_item_ger_static -icon_item_fra_static -item_name_static -map_name_static -do_action_static -message_static -message_texture_static -nes_font_static -nes_message_data_static -ger_message_data_static -fra_message_data_static -staff_message_data_static -map_grand_static -map_i_static -map_48x85_static -code -ovl_title -ovl_select -ovl_opening -ovl_file_choose -ovl_kaleido_scope -ovl_player_actor -ovl_map_mark_data -ovl_En_Test -ovl_Arms_Hook -ovl_Arrow_Fire -ovl_Arrow_Ice -ovl_Arrow_Light -ovl_Bg_Bdan_Objects -ovl_Bg_Bdan_Switch -ovl_Bg_Bom_Guard -ovl_Bg_Bombwall -ovl_Bg_Bowl_Wall -ovl_Bg_Breakwall -ovl_Bg_Ddan_Jd -ovl_Bg_Ddan_Kd -ovl_Bg_Dodoago -ovl_Bg_Dy_Yoseizo -ovl_Bg_Ganon_Otyuka -ovl_Bg_Gate_Shutter -ovl_Bg_Gjyo_Bridge -ovl_Bg_Gnd_Darkmeiro -ovl_Bg_Gnd_Firemeiro -ovl_Bg_Gnd_Iceblock -ovl_Bg_Gnd_Nisekabe -ovl_Bg_Gnd_Soulmeiro -ovl_Bg_Haka -ovl_Bg_Haka_Gate -ovl_Bg_Haka_Huta -ovl_Bg_Haka_Megane -ovl_Bg_Haka_MeganeBG -ovl_Bg_Haka_Sgami -ovl_Bg_Haka_Ship -ovl_Bg_Haka_Trap -ovl_Bg_Haka_Tubo -ovl_Bg_Haka_Water -ovl_Bg_Haka_Zou -ovl_Bg_Heavy_Block -ovl_Bg_Hidan_Curtain -ovl_Bg_Hidan_Dalm -ovl_Bg_Hidan_Firewall -ovl_Bg_Hidan_Fslift -ovl_Bg_Hidan_Fwbig -ovl_Bg_Hidan_Hamstep -ovl_Bg_Hidan_Hrock -ovl_Bg_Hidan_Kousi -ovl_Bg_Hidan_Kowarerukabe -ovl_Bg_Hidan_Rock -ovl_Bg_Hidan_Rsekizou -ovl_Bg_Hidan_Sekizou -ovl_Bg_Hidan_Sima -ovl_Bg_Hidan_Syoku -ovl_Bg_Ice_Objects -ovl_Bg_Ice_Shelter -ovl_Bg_Ice_Shutter -ovl_Bg_Ice_Turara -ovl_Bg_Ingate -ovl_Bg_Jya_1flift -ovl_Bg_Jya_Amishutter -ovl_Bg_Jya_Bigmirror -ovl_Bg_Jya_Block -ovl_Bg_Jya_Bombchuiwa -ovl_Bg_Jya_Bombiwa -ovl_Bg_Jya_Cobra -ovl_Bg_Jya_Goroiwa -ovl_Bg_Jya_Haheniron -ovl_Bg_Jya_Ironobj -ovl_Bg_Jya_Kanaami -ovl_Bg_Jya_Lift -ovl_Bg_Jya_Megami -ovl_Bg_Jya_Zurerukabe -ovl_Bg_Menkuri_Eye -ovl_Bg_Menkuri_Kaiten -ovl_Bg_Menkuri_Nisekabe -ovl_Bg_Mizu_Bwall -ovl_Bg_Mizu_Movebg -ovl_Bg_Mizu_Shutter -ovl_Bg_Mizu_Uzu -ovl_Bg_Mizu_Water -ovl_Bg_Mjin -ovl_Bg_Mori_Bigst -ovl_Bg_Mori_Elevator -ovl_Bg_Mori_Hashigo -ovl_Bg_Mori_Hashira4 -ovl_Bg_Mori_Hineri -ovl_Bg_Mori_Idomizu -ovl_Bg_Mori_Kaitenkabe -ovl_Bg_Mori_Rakkatenjo -ovl_Bg_Po_Event -ovl_Bg_Po_Syokudai -ovl_Bg_Pushbox -ovl_Bg_Relay_Objects -ovl_Bg_Spot00_Break -ovl_Bg_Spot00_Hanebasi -ovl_Bg_Spot01_Fusya -ovl_Bg_Spot01_Idohashira -ovl_Bg_Spot01_Idomizu -ovl_Bg_Spot01_Idosoko -ovl_Bg_Spot01_Objects2 -ovl_Bg_Spot02_Objects -ovl_Bg_Spot03_Taki -ovl_Bg_Spot05_Soko -ovl_Bg_Spot06_Objects -ovl_Bg_Spot07_Taki -ovl_Bg_Spot08_Bakudankabe -ovl_Bg_Spot08_Iceblock -ovl_Bg_Spot09_Obj -ovl_Bg_Spot11_Bakudankabe -ovl_Bg_Spot11_Oasis -ovl_Bg_Spot12_Gate -ovl_Bg_Spot12_Saku -ovl_Bg_Spot15_Rrbox -ovl_Bg_Spot15_Saku -ovl_Bg_Spot16_Bombstone -ovl_Bg_Spot16_Doughnut -ovl_Bg_Spot17_Bakudankabe -ovl_Bg_Spot17_Funen -ovl_Bg_Spot18_Basket -ovl_Bg_Spot18_Futa -ovl_Bg_Spot18_Obj -ovl_Bg_Spot18_Shutter -ovl_Bg_Sst_Floor -ovl_Bg_Toki_Hikari -ovl_Bg_Toki_Swd -ovl_Bg_Treemouth -ovl_Bg_Umajump -ovl_Bg_Vb_Sima -ovl_Bg_Ydan_Hasi -ovl_Bg_Ydan_Maruta -ovl_Bg_Ydan_Sp -ovl_Bg_Zg -ovl_Boss_Dodongo -ovl_Boss_Fd -ovl_Boss_Fd2 -ovl_Boss_Ganon -ovl_Boss_Ganon2 -ovl_Boss_Ganondrof -ovl_Boss_Goma -ovl_Boss_Mo -ovl_Boss_Sst -ovl_Boss_Tw -ovl_Boss_Va -ovl_Demo_6K -ovl_Demo_Du -ovl_Demo_Ec -ovl_Demo_Effect -ovl_Demo_Ext -ovl_Demo_Geff -ovl_Demo_Gj -ovl_Demo_Go -ovl_Demo_Gt -ovl_Demo_Ik -ovl_Demo_Im -ovl_Demo_Kankyo -ovl_Demo_Kekkai -ovl_Demo_Sa -ovl_Demo_Shd -ovl_Demo_Tre_Lgt -ovl_Door_Ana -ovl_Door_Gerudo -ovl_Door_Killer -ovl_Door_Shutter -ovl_Door_Toki -ovl_Door_Warp1 -ovl_Efc_Erupc -ovl_Eff_Dust -ovl_Effect_Ss_Blast -ovl_Effect_Ss_Bomb -ovl_Effect_Ss_Bomb2 -ovl_Effect_Ss_Bubble -ovl_Effect_Ss_D_Fire -ovl_Effect_Ss_Dead_Db -ovl_Effect_Ss_Dead_Dd -ovl_Effect_Ss_Dead_Ds -ovl_Effect_Ss_Dead_Sound -ovl_Effect_Ss_Dt_Bubble -ovl_Effect_Ss_Dust -ovl_Effect_Ss_En_Fire -ovl_Effect_Ss_En_Ice -ovl_Effect_Ss_Extra -ovl_Effect_Ss_Fcircle -ovl_Effect_Ss_Fhg_Flash -ovl_Effect_Ss_Fire_Tail -ovl_Effect_Ss_G_Fire -ovl_Effect_Ss_G_Magma -ovl_Effect_Ss_G_Magma2 -ovl_Effect_Ss_G_Ripple -ovl_Effect_Ss_G_Spk -ovl_Effect_Ss_G_Splash -ovl_Effect_Ss_Hahen -ovl_Effect_Ss_HitMark -ovl_Effect_Ss_Ice_Piece -ovl_Effect_Ss_Ice_Smoke -ovl_Effect_Ss_K_Fire -ovl_Effect_Ss_Kakera -ovl_Effect_Ss_KiraKira -ovl_Effect_Ss_Lightning -ovl_Effect_Ss_Sibuki -ovl_Effect_Ss_Sibuki2 -ovl_Effect_Ss_Solder_Srch_Ball -ovl_Effect_Ss_Stick -ovl_Effect_Ss_Stone1 -ovl_Elf_Msg -ovl_Elf_Msg2 -ovl_En_Am -ovl_En_Ani -ovl_En_Anubice -ovl_En_Anubice_Fire -ovl_En_Anubice_Tag -ovl_En_Arow_Trap -ovl_En_Arrow -ovl_En_Attack_Niw -ovl_En_Ba -ovl_En_Bb -ovl_En_Bdfire -ovl_En_Bigokuta -ovl_En_Bili -ovl_En_Bird -ovl_En_Blkobj -ovl_En_Bom -ovl_En_Bom_Bowl_Man -ovl_En_Bom_Bowl_Pit -ovl_En_Bom_Chu -ovl_En_Bombf -ovl_En_Boom -ovl_En_Box -ovl_En_Brob -ovl_En_Bubble -ovl_En_Butte -ovl_En_Bw -ovl_En_Bx -ovl_En_Changer -ovl_En_Clear_Tag -ovl_En_Cow -ovl_En_Crow -ovl_En_Cs -ovl_En_Daiku -ovl_En_Daiku_Kakariko -ovl_En_Dekubaba -ovl_En_Dekunuts -ovl_En_Dh -ovl_En_Dha -ovl_En_Diving_Game -ovl_En_Dns -ovl_En_Dnt_Demo -ovl_En_Dnt_Jiji -ovl_En_Dnt_Nomal -ovl_En_Dodojr -ovl_En_Dodongo -ovl_En_Dog -ovl_En_Door -ovl_En_Ds -ovl_En_Du -ovl_En_Dy_Extra -ovl_En_Eg -ovl_En_Eiyer -ovl_En_Elf -ovl_En_Encount1 -ovl_En_Encount2 -ovl_En_Ex_Item -ovl_En_Ex_Ruppy -ovl_En_Fd -ovl_En_Fd_Fire -ovl_En_Fhg_Fire -ovl_En_Fire_Rock -ovl_En_Firefly -ovl_En_Fish -ovl_En_Floormas -ovl_En_Fr -ovl_En_Fu -ovl_En_Fw -ovl_En_Fz -ovl_En_G_Switch -ovl_En_Ganon_Mant -ovl_En_Ganon_Organ -ovl_En_Gb -ovl_En_Ge1 -ovl_En_Ge2 -ovl_En_Ge3 -ovl_En_GeldB -ovl_En_GirlA -ovl_En_Gm -ovl_En_Go -ovl_En_Go2 -ovl_En_Goma -ovl_En_Goroiwa -ovl_En_Gs -ovl_En_Guest -ovl_En_Hata -ovl_En_Heishi1 -ovl_En_Heishi2 -ovl_En_Heishi3 -ovl_En_Heishi4 -ovl_En_Hintnuts -ovl_En_Holl -ovl_En_Honotrap -ovl_En_Horse -ovl_En_Horse_Game_Check -ovl_En_Horse_Ganon -ovl_En_Horse_Link_Child -ovl_En_Horse_Normal -ovl_En_Horse_Zelda -ovl_En_Hs -ovl_En_Hs2 -ovl_En_Hy -ovl_En_Ice_Hono -ovl_En_Ik -ovl_En_In -ovl_En_Insect -ovl_En_Ishi -ovl_En_It -ovl_En_Jj -ovl_En_Js -ovl_En_Jsjutan -ovl_En_Kakasi -ovl_En_Kakasi2 -ovl_En_Kakasi3 -ovl_En_Kanban -ovl_En_Karebaba -ovl_En_Ko -ovl_En_Kusa -ovl_En_Kz -ovl_En_Light -ovl_En_Lightbox -ovl_En_M_Fire1 -ovl_En_M_Thunder -ovl_En_Ma1 -ovl_En_Ma2 -ovl_En_Ma3 -ovl_En_Mag -ovl_En_Mb -ovl_En_Md -ovl_En_Mk -ovl_En_Mm -ovl_En_Mm2 -ovl_En_Ms -ovl_En_Mu -ovl_En_Nb -ovl_En_Niw -ovl_En_Niw_Girl -ovl_En_Niw_Lady -ovl_En_Nutsball -ovl_En_Nwc -ovl_En_Ny -ovl_En_OE2 -ovl_En_Okarina_Effect -ovl_En_Okarina_Tag -ovl_En_Okuta -ovl_En_Ossan -ovl_En_Owl -ovl_En_Part -ovl_En_Peehat -ovl_En_Po_Desert -ovl_En_Po_Field -ovl_En_Po_Relay -ovl_En_Po_Sisters -ovl_En_Poh -ovl_En_Pu_box -ovl_En_Rd -ovl_En_Reeba -ovl_En_River_Sound -ovl_En_Rl -ovl_En_Rr -ovl_En_Ru1 -ovl_En_Ru2 -ovl_En_Sa -ovl_En_Sb -ovl_En_Scene_Change -ovl_En_Sda -ovl_En_Shopnuts -ovl_En_Si -ovl_En_Siofuki -ovl_En_Skb -ovl_En_Skj -ovl_En_Skjneedle -ovl_En_Ssh -ovl_En_St -ovl_En_Sth -ovl_En_Stream -ovl_En_Sw -ovl_En_Syateki_Itm -ovl_En_Syateki_Man -ovl_En_Syateki_Niw -ovl_En_Ta -ovl_En_Takara_Man -ovl_En_Tana -ovl_En_Tg -ovl_En_Tite -ovl_En_Tk -ovl_En_Torch -ovl_En_Torch2 -ovl_En_Toryo -ovl_En_Tp -ovl_En_Tr -ovl_En_Trap -ovl_En_Tubo_Trap -ovl_En_Vali -ovl_En_Vase -ovl_En_Vb_Ball -ovl_En_Viewer -ovl_En_Vm -ovl_En_Wall_Tubo -ovl_En_Wallmas -ovl_En_Weather_Tag -ovl_En_Weiyer -ovl_En_Wf -ovl_En_Wonder_Item -ovl_En_Wonder_Talk -ovl_En_Wonder_Talk2 -ovl_En_Wood02 -ovl_En_Xc -ovl_En_Yabusame_Mark -ovl_En_Yukabyun -ovl_En_Zf -ovl_En_Zl1 -ovl_En_Zl2 -ovl_En_Zl3 -ovl_En_Zl4 -ovl_En_Zo -ovl_En_fHG -ovl_End_Title -ovl_Fishing -ovl_Item_B_Heart -ovl_Item_Etcetera -ovl_Item_Inbox -ovl_Item_Ocarina -ovl_Item_Shield -ovl_Magic_Dark -ovl_Magic_Fire -ovl_Magic_Wind -ovl_Mir_Ray -ovl_Obj_Bean -ovl_Obj_Blockstop -ovl_Obj_Bombiwa -ovl_Obj_Comb -ovl_Obj_Dekujr -ovl_Obj_Elevator -ovl_Obj_Hamishi -ovl_Obj_Hana -ovl_Obj_Hsblock -ovl_Obj_Ice_Poly -ovl_Obj_Kibako -ovl_Obj_Kibako2 -ovl_Obj_Lift -ovl_Obj_Lightswitch -ovl_Obj_Makekinsuta -ovl_Obj_Makeoshihiki -ovl_Obj_Mure -ovl_Obj_Mure2 -ovl_Obj_Mure3 -ovl_Obj_Oshihiki -ovl_Obj_Roomtimer -ovl_Obj_Switch -ovl_Obj_Syokudai -ovl_Obj_Timeblock -ovl_Obj_Tsubo -ovl_Obj_Warp2block -ovl_Object_Kankyo -ovl_Oceff_Spot -ovl_Oceff_Storm -ovl_Oceff_Wipe -ovl_Oceff_Wipe2 -ovl_Oceff_Wipe3 -ovl_Oceff_Wipe4 -ovl_Shot_Sun -gameplay_keep -gameplay_field_keep -gameplay_dangeon_keep -gameplay_object_exchange_static -object_link_boy -object_link_child -object_box -object_human -object_okuta -object_poh -object_wallmaster -object_dy_obj -object_firefly -object_dodongo -object_fire -object_niw -object_tite -object_reeba -object_peehat -object_kingdodongo -object_horse -object_zf -object_goma -object_zl1 -object_gol -object_bubble -object_dodojr -object_torch2 -object_bl -object_tp -object_oA1 -object_st -object_bw -object_ei -object_horse_normal -object_oB1 -object_o_anime -object_spot04_objects -object_ddan_objects -object_hidan_objects -object_horse_ganon -object_oA2 -object_spot00_objects -object_mb -object_bombf -object_sk2 -object_oE1 -object_oE_anime -object_oE2 -object_ydan_objects -object_gnd -object_am -object_dekubaba -object_oA3 -object_oA4 -object_oA5 -object_oA6 -object_oA7 -object_jj -object_oA8 -object_oA9 -object_oB2 -object_oB3 -object_oB4 -object_horse_zelda -object_opening_demo1 -object_warp1 -object_b_heart -object_dekunuts -object_oE3 -object_oE4 -object_menkuri_objects -object_oE5 -object_oE6 -object_oE7 -object_oE8 -object_oE9 -object_oE10 -object_oE11 -object_oE12 -object_vali -object_oA10 -object_oA11 -object_mizu_objects -object_fhg -object_ossan -object_mori_hineri1 -object_Bb -object_toki_objects -object_yukabyun -object_zl2 -object_mjin -object_mjin_flash -object_mjin_dark -object_mjin_flame -object_mjin_ice -object_mjin_soul -object_mjin_wind -object_mjin_oka -object_haka_objects -object_spot06_objects -object_ice_objects -object_relay_objects -object_mori_hineri1a -object_mori_hineri2 -object_mori_hineri2a -object_mori_objects -object_mori_tex -object_spot08_obj -object_warp2 -object_hata -object_bird -object_wood02 -object_lightbox -object_pu_box -object_trap -object_vase -object_im -object_ta -object_tk -object_xc -object_vm -object_bv -object_hakach_objects -object_efc_crystal_light -object_efc_fire_ball -object_efc_flash -object_efc_lgt_shower -object_efc_star_field -object_god_lgt -object_light_ring -object_triforce_spot -object_medal -object_bdan_objects -object_sd -object_rd -object_po_sisters -object_heavy_object -object_gndd -object_fd -object_du -object_fw -object_horse_link_child -object_spot02_objects -object_haka -object_ru1 -object_syokudai -object_fd2 -object_dh -object_rl -object_efc_tw -object_demo_tre_lgt -object_gi_key -object_mir_ray -object_brob -object_gi_jewel -object_spot09_obj -object_spot18_obj -object_bdoor -object_spot17_obj -object_shop_dungen -object_nb -object_mo -object_sb -object_gi_melody -object_gi_heart -object_gi_compass -object_gi_bosskey -object_gi_medal -object_gi_nuts -object_sa -object_gi_hearts -object_gi_arrowcase -object_gi_bombpouch -object_in -object_tr -object_spot16_obj -object_oE1s -object_oE4s -object_os_anime -object_gi_bottle -object_gi_stick -object_gi_map -object_oF1d_map -object_ru2 -object_gi_shield_1 -object_dekujr -object_gi_magicpot -object_gi_bomb_1 -object_oF1s -object_ma2 -object_gi_purse -object_hni -object_tw -object_rr -object_bxa -object_anubice -object_gi_gerudo -object_gi_arrow -object_gi_bomb_2 -object_gi_egg -object_gi_scale -object_gi_shield_2 -object_gi_hookshot -object_gi_ocarina -object_gi_milk -object_ma1 -object_ganon -object_sst -object_ny -object_fr -object_gi_pachinko -object_gi_boomerang -object_gi_bow -object_gi_glasses -object_gi_liquid -object_ani -object_demo_6k -object_gi_shield_3 -object_gi_letter -object_spot15_obj -object_jya_obj -object_gi_clothes -object_gi_bean -object_gi_fish -object_gi_saw -object_gi_hammer -object_gi_grass -object_gi_longsword -object_spot01_objects -object_md -object_km1 -object_kw1 -object_zo -object_kz -object_umajump -object_masterkokiri -object_masterkokirihead -object_mastergolon -object_masterzoora -object_aob -object_ik -object_ahg -object_cne -object_gi_niwatori -object_skj -object_gi_bottle_letter -object_bji -object_bba -object_gi_ocarina_0 -object_ds -object_ane -object_boj -object_spot03_object -object_spot07_object -object_fz -object_bob -object_ge1 -object_yabusame_point -object_gi_boots_2 -object_gi_seed -object_gnd_magic -object_d_elevator -object_d_hsblock -object_d_lift -object_mamenoki -object_goroiwa -object_toryo -object_daiku -object_nwc -object_blkobj -object_gm -object_ms -object_hs -object_ingate -object_lightswitch -object_kusa -object_tsubo -object_gi_gloves -object_gi_coin -object_kanban -object_gjyo_objects -object_owl -object_mk -object_fu -object_gi_ki_tan_mask -object_gi_redead_mask -object_gi_skj_mask -object_gi_rabit_mask -object_gi_truth_mask -object_ganon_objects -object_siofuki -object_stream -object_mm -object_fa -object_os -object_gi_eye_lotion -object_gi_powder -object_gi_mushroom -object_gi_ticketstone -object_gi_brokensword -object_js -object_cs -object_gi_prescription -object_gi_bracelet -object_gi_soldout -object_gi_frog -object_mag -object_door_gerudo -object_gt -object_efc_erupc -object_zl2_anime1 -object_zl2_anime2 -object_gi_golonmask -object_gi_zoramask -object_gi_gerudomask -object_ganon2 -object_ka -object_ts -object_zg -object_gi_hoverboots -object_gi_m_arrow -object_ds2 -object_ec -object_fish -object_gi_sutaru -object_gi_goddess -object_ssh -object_bigokuta -object_bg -object_spot05_objects -object_spot12_obj -object_bombiwa -object_hintnuts -object_rs -object_spot00_break -object_gla -object_shopnuts -object_geldb -object_gr -object_dog -object_jya_iron -object_jya_door -object_spot01_objects2 -object_spot11_obj -object_kibako2 -object_dns -object_dnk -object_gi_fire -object_gi_insect -object_gi_butterfly -object_gi_ghost -object_gi_soul -object_bowl -object_po_field -object_demo_kekkai -object_efc_doughnut -object_gi_dekupouch -object_ganon_anime1 -object_ganon_anime2 -object_ganon_anime3 -object_gi_rupy -object_spot01_matoya -object_spot01_matoyab -object_po_composer -object_mu -object_wf -object_skb -object_gj -object_geff -object_haka_door -object_gs -object_ps -object_bwall -object_crow -object_cow -object_cob -object_gi_sword_1 -object_door_killer -object_ouke_haka -object_timeblock -object_zl4 -g_pn_01 -g_pn_02 -g_pn_03 -g_pn_04 -g_pn_05 -g_pn_06 -g_pn_07 -g_pn_08 -g_pn_09 -g_pn_10 -g_pn_11 -g_pn_12 -g_pn_13 -g_pn_14 -g_pn_15 -g_pn_16 -g_pn_17 -g_pn_18 -g_pn_19 -g_pn_20 -g_pn_21 -g_pn_22 -g_pn_23 -g_pn_24 -g_pn_25 -g_pn_26 -g_pn_27 -g_pn_28 -g_pn_29 -g_pn_30 -g_pn_31 -g_pn_32 -g_pn_33 -g_pn_34 -g_pn_35 -g_pn_36 -g_pn_37 -g_pn_38 -g_pn_39 -g_pn_40 -g_pn_41 -g_pn_42 -g_pn_43 -g_pn_44 -g_pn_45 -g_pn_46 -g_pn_47 -g_pn_48 -g_pn_49 -g_pn_50 -g_pn_51 -g_pn_52 -g_pn_53 -g_pn_54 -g_pn_55 -g_pn_56 -g_pn_57 -z_select_static -nintendo_rogo_static -title_static -parameter_static -vr_fine0_static -vr_fine0_pal_static -vr_fine1_static -vr_fine1_pal_static -vr_fine2_static -vr_fine2_pal_static -vr_fine3_static -vr_fine3_pal_static -vr_cloud0_static -vr_cloud0_pal_static -vr_cloud1_static -vr_cloud1_pal_static -vr_cloud2_static -vr_cloud2_pal_static -vr_cloud3_static -vr_cloud3_pal_static -vr_holy0_static -vr_holy0_pal_static -vr_holy1_static -vr_holy1_pal_static -vr_MDVR_static -vr_MDVR_pal_static -vr_MNVR_static -vr_MNVR_pal_static -vr_RUVR_static -vr_RUVR_pal_static -vr_LHVR_static -vr_LHVR_pal_static -vr_KHVR_static -vr_KHVR_pal_static -vr_K3VR_static -vr_K3VR_pal_static -vr_K4VR_static -vr_K4VR_pal_static -vr_K5VR_static -vr_K5VR_pal_static -vr_SP1a_static -vr_SP1a_pal_static -vr_MLVR_static -vr_MLVR_pal_static -vr_KKRVR_static -vr_KKRVR_pal_static -vr_KR3VR_static -vr_KR3VR_pal_static -vr_IPVR_static -vr_IPVR_pal_static -vr_KSVR_static -vr_KSVR_pal_static -vr_GLVR_static -vr_GLVR_pal_static -vr_ZRVR_static -vr_ZRVR_pal_static -vr_DGVR_static -vr_DGVR_pal_static -vr_ALVR_static -vr_ALVR_pal_static -vr_NSVR_static -vr_NSVR_pal_static -vr_LBVR_static -vr_LBVR_pal_static -vr_TTVR_static -vr_TTVR_pal_static -vr_FCVR_static -vr_FCVR_pal_static -elf_message_field -elf_message_ydan -syotes_scene -syotes_room_0 -syotes2_scene -syotes2_room_0 -depth_test_scene -depth_test_room_0 -spot00_scene -spot00_room_0 -spot01_scene -spot01_room_0 -spot02_scene -spot02_room_0 -spot02_room_1 -spot03_scene -spot03_room_0 -spot03_room_1 -spot04_scene -spot04_room_0 -spot04_room_1 -spot04_room_2 -spot05_scene -spot05_room_0 -spot06_scene -spot06_room_0 -spot07_scene -spot07_room_0 -spot07_room_1 -spot08_scene -spot08_room_0 -spot09_scene -spot09_room_0 -spot10_scene -spot10_room_0 -spot10_room_1 -spot10_room_2 -spot10_room_3 -spot10_room_4 -spot10_room_5 -spot10_room_6 -spot10_room_7 -spot10_room_8 -spot10_room_9 -spot11_scene -spot11_room_0 -spot12_scene -spot12_room_0 -spot12_room_1 -spot13_scene -spot13_room_0 -spot13_room_1 -spot15_scene -spot15_room_0 -spot16_scene -spot16_room_0 -spot17_scene -spot17_room_0 -spot17_room_1 -spot18_scene -spot18_room_0 -spot18_room_1 -spot18_room_2 -spot18_room_3 -ydan_scene -ydan_room_0 -ydan_room_1 -ydan_room_2 -ydan_room_3 -ydan_room_4 -ydan_room_5 -ydan_room_6 -ydan_room_7 -ydan_room_8 -ydan_room_9 -ydan_room_10 -ydan_room_11 -ddan_scene -ddan_room_0 -ddan_room_1 -ddan_room_2 -ddan_room_3 -ddan_room_4 -ddan_room_5 -ddan_room_6 -ddan_room_7 -ddan_room_8 -ddan_room_9 -ddan_room_10 -ddan_room_11 -ddan_room_12 -ddan_room_13 -ddan_room_14 -ddan_room_15 -ddan_room_16 -bdan_scene -bdan_room_0 -bdan_room_1 -bdan_room_2 -bdan_room_3 -bdan_room_4 -bdan_room_5 -bdan_room_6 -bdan_room_7 -bdan_room_8 -bdan_room_9 -bdan_room_10 -bdan_room_11 -bdan_room_12 -bdan_room_13 -bdan_room_14 -bdan_room_15 -Bmori1_scene -Bmori1_room_0 -Bmori1_room_1 -Bmori1_room_2 -Bmori1_room_3 -Bmori1_room_4 -Bmori1_room_5 -Bmori1_room_6 -Bmori1_room_7 -Bmori1_room_8 -Bmori1_room_9 -Bmori1_room_10 -Bmori1_room_11 -Bmori1_room_12 -Bmori1_room_13 -Bmori1_room_14 -Bmori1_room_15 -Bmori1_room_16 -Bmori1_room_17 -Bmori1_room_18 -Bmori1_room_19 -Bmori1_room_20 -Bmori1_room_21 -Bmori1_room_22 -HIDAN_scene -HIDAN_room_0 -HIDAN_room_1 -HIDAN_room_2 -HIDAN_room_3 -HIDAN_room_4 -HIDAN_room_5 -HIDAN_room_6 -HIDAN_room_7 -HIDAN_room_8 -HIDAN_room_9 -HIDAN_room_10 -HIDAN_room_11 -HIDAN_room_12 -HIDAN_room_13 -HIDAN_room_14 -HIDAN_room_15 -HIDAN_room_16 -HIDAN_room_17 -HIDAN_room_18 -HIDAN_room_19 -HIDAN_room_20 -HIDAN_room_21 -HIDAN_room_22 -HIDAN_room_23 -HIDAN_room_24 -HIDAN_room_25 -HIDAN_room_26 -MIZUsin_scene -MIZUsin_room_0 -MIZUsin_room_1 -MIZUsin_room_2 -MIZUsin_room_3 -MIZUsin_room_4 -MIZUsin_room_5 -MIZUsin_room_6 -MIZUsin_room_7 -MIZUsin_room_8 -MIZUsin_room_9 -MIZUsin_room_10 -MIZUsin_room_11 -MIZUsin_room_12 -MIZUsin_room_13 -MIZUsin_room_14 -MIZUsin_room_15 -MIZUsin_room_16 -MIZUsin_room_17 -MIZUsin_room_18 -MIZUsin_room_19 -MIZUsin_room_20 -MIZUsin_room_21 -MIZUsin_room_22 -jyasinzou_scene -jyasinzou_room_0 -jyasinzou_room_1 -jyasinzou_room_2 -jyasinzou_room_3 -jyasinzou_room_4 -jyasinzou_room_5 -jyasinzou_room_6 -jyasinzou_room_7 -jyasinzou_room_8 -jyasinzou_room_9 -jyasinzou_room_10 -jyasinzou_room_11 -jyasinzou_room_12 -jyasinzou_room_13 -jyasinzou_room_14 -jyasinzou_room_15 -jyasinzou_room_16 -jyasinzou_room_17 -jyasinzou_room_18 -jyasinzou_room_19 -jyasinzou_room_20 -jyasinzou_room_21 -jyasinzou_room_22 -jyasinzou_room_23 -jyasinzou_room_24 -jyasinzou_room_25 -jyasinzou_room_26 -jyasinzou_room_27 -jyasinzou_room_28 -HAKAdan_scene -HAKAdan_room_0 -HAKAdan_room_1 -HAKAdan_room_2 -HAKAdan_room_3 -HAKAdan_room_4 -HAKAdan_room_5 -HAKAdan_room_6 -HAKAdan_room_7 -HAKAdan_room_8 -HAKAdan_room_9 -HAKAdan_room_10 -HAKAdan_room_11 -HAKAdan_room_12 -HAKAdan_room_13 -HAKAdan_room_14 -HAKAdan_room_15 -HAKAdan_room_16 -HAKAdan_room_17 -HAKAdan_room_18 -HAKAdan_room_19 -HAKAdan_room_20 -HAKAdan_room_21 -HAKAdan_room_22 -HAKAdanCH_scene -HAKAdanCH_room_0 -HAKAdanCH_room_1 -HAKAdanCH_room_2 -HAKAdanCH_room_3 -HAKAdanCH_room_4 -HAKAdanCH_room_5 -HAKAdanCH_room_6 -ice_doukutu_scene -ice_doukutu_room_0 -ice_doukutu_room_1 -ice_doukutu_room_2 -ice_doukutu_room_3 -ice_doukutu_room_4 -ice_doukutu_room_5 -ice_doukutu_room_6 -ice_doukutu_room_7 -ice_doukutu_room_8 -ice_doukutu_room_9 -ice_doukutu_room_10 -ice_doukutu_room_11 -men_scene -men_room_0 -men_room_1 -men_room_2 -men_room_3 -men_room_4 -men_room_5 -men_room_6 -men_room_7 -men_room_8 -men_room_9 -men_room_10 -ganontika_scene -ganontika_room_0 -ganontika_room_1 -ganontika_room_2 -ganontika_room_3 -ganontika_room_4 -ganontika_room_5 -ganontika_room_6 -ganontika_room_7 -ganontika_room_8 -ganontika_room_9 -ganontika_room_10 -ganontika_room_11 -ganontika_room_12 -ganontika_room_13 -ganontika_room_14 -ganontika_room_15 -ganontika_room_16 -ganontika_room_17 -ganontika_room_18 -ganontika_room_19 -market_day_scene -market_day_room_0 -market_night_scene -market_night_room_0 -testroom_scene -testroom_room_0 -testroom_room_1 -testroom_room_2 -testroom_room_3 -testroom_room_4 -kenjyanoma_scene -kenjyanoma_room_0 -tokinoma_scene -tokinoma_room_0 -tokinoma_room_1 -sutaru_scene -sutaru_room_0 -link_home_scene -link_home_room_0 -kokiri_shop_scene -kokiri_shop_room_0 -kokiri_home_scene -kokiri_home_room_0 -kakusiana_scene -kakusiana_room_0 -kakusiana_room_1 -kakusiana_room_2 -kakusiana_room_3 -kakusiana_room_4 -kakusiana_room_5 -kakusiana_room_6 -kakusiana_room_7 -kakusiana_room_8 -kakusiana_room_9 -kakusiana_room_10 -kakusiana_room_11 -kakusiana_room_12 -kakusiana_room_13 -entra_scene -entra_room_0 -moribossroom_scene -moribossroom_room_0 -moribossroom_room_1 -syatekijyou_scene -syatekijyou_room_0 -shop1_scene -shop1_room_0 -hairal_niwa_scene -hairal_niwa_room_0 -ganon_tou_scene -ganon_tou_room_0 -sasatest_scene -sasatest_room_0 -market_alley_scene -market_alley_room_0 -spot20_scene -spot20_room_0 -market_ruins_scene -market_ruins_room_0 -entra_n_scene -entra_n_room_0 -enrui_scene -enrui_room_0 -market_alley_n_scene -market_alley_n_room_0 -hiral_demo_scene -hiral_demo_room_0 -kokiri_home3_scene -kokiri_home3_room_0 -malon_stable_scene -malon_stable_room_0 -kakariko_scene -kakariko_room_0 -bdan_boss_scene -bdan_boss_room_0 -bdan_boss_room_1 -FIRE_bs_scene -FIRE_bs_room_0 -FIRE_bs_room_1 -hut_scene -hut_room_0 -daiyousei_izumi_scene -daiyousei_izumi_room_0 -hakaana_scene -hakaana_room_0 -yousei_izumi_tate_scene -yousei_izumi_tate_room_0 -yousei_izumi_yoko_scene -yousei_izumi_yoko_room_0 -golon_scene -golon_room_0 -zoora_scene -zoora_room_0 -drag_scene -drag_room_0 -alley_shop_scene -alley_shop_room_0 -night_shop_scene -night_shop_room_0 -impa_scene -impa_room_0 -labo_scene -labo_room_0 -tent_scene -tent_room_0 -nakaniwa_scene -nakaniwa_room_0 -ddan_boss_scene -ddan_boss_room_0 -ddan_boss_room_1 -ydan_boss_scene -ydan_boss_room_0 -ydan_boss_room_1 -HAKAdan_bs_scene -HAKAdan_bs_room_0 -HAKAdan_bs_room_1 -MIZUsin_bs_scene -MIZUsin_bs_room_0 -MIZUsin_bs_room_1 -ganon_scene -ganon_room_0 -ganon_room_1 -ganon_room_2 -ganon_room_3 -ganon_room_4 -ganon_room_5 -ganon_room_6 -ganon_room_7 -ganon_room_8 -ganon_room_9 -ganon_boss_scene -ganon_boss_room_0 -jyasinboss_scene -jyasinboss_room_0 -jyasinboss_room_1 -jyasinboss_room_2 -jyasinboss_room_3 -kokiri_home4_scene -kokiri_home4_room_0 -kokiri_home5_scene -kokiri_home5_room_0 -ganon_final_scene -ganon_final_room_0 -kakariko3_scene -kakariko3_room_0 -hairal_niwa2_scene -hairal_niwa2_room_0 -hakasitarelay_scene -hakasitarelay_room_0 -hakasitarelay_room_1 -hakasitarelay_room_2 -hakasitarelay_room_3 -hakasitarelay_room_4 -hakasitarelay_room_5 -hakasitarelay_room_6 -shrine_scene -shrine_room_0 -turibori_scene -turibori_room_0 -shrine_n_scene -shrine_n_room_0 -shrine_r_scene -shrine_r_room_0 -hakaana2_scene -hakaana2_room_0 -gerudoway_scene -gerudoway_room_0 -gerudoway_room_1 -gerudoway_room_2 -gerudoway_room_3 -gerudoway_room_4 -gerudoway_room_5 -hairal_niwa_n_scene -hairal_niwa_n_room_0 -bowling_scene -bowling_room_0 -hakaana_ouke_scene -hakaana_ouke_room_0 -hakaana_ouke_room_1 -hakaana_ouke_room_2 -hylia_labo_scene -hylia_labo_room_0 -souko_scene -souko_room_0 -souko_room_1 -souko_room_2 -miharigoya_scene -miharigoya_room_0 -mahouya_scene -mahouya_room_0 -takaraya_scene -takaraya_room_0 -takaraya_room_1 -takaraya_room_2 -takaraya_room_3 -takaraya_room_4 -takaraya_room_5 -takaraya_room_6 -ganon_sonogo_scene -ganon_sonogo_room_0 -ganon_sonogo_room_1 -ganon_sonogo_room_2 -ganon_sonogo_room_3 -ganon_sonogo_room_4 -ganon_demo_scene -ganon_demo_room_0 -besitu_scene -besitu_room_0 -face_shop_scene -face_shop_room_0 -kinsuta_scene -kinsuta_room_0 -ganontikasonogo_scene -ganontikasonogo_room_0 -ganontikasonogo_room_1 -test01_scene -test01_room_0 -bump_texture_static -anime_model_1_static -anime_model_2_static -anime_model_3_static -anime_model_4_static -anime_model_5_static -anime_model_6_static -anime_texture_1_static -anime_texture_2_static -anime_texture_3_static -anime_texture_4_static -anime_texture_5_static -anime_texture_6_static -softsprite_matrix_static \ No newline at end of file diff --git a/OTRExporter/CFG/filelists/gamecube.txt b/OTRExporter/CFG/filelists/gamecube.txt deleted file mode 100644 index 23794e1f6..000000000 --- a/OTRExporter/CFG/filelists/gamecube.txt +++ /dev/null @@ -1,1509 +0,0 @@ -makerom -boot -dmadata -Audiobank -Audioseq -Audiotable -kanji -link_animetion -icon_item_static -icon_item_24_static -icon_item_field_static -icon_item_dungeon_static -icon_item_gameover_static -icon_item_jpn_static -icon_item_nes_static -item_name_static -map_name_static -do_action_static -message_static -message_texture_static -nes_font_static -jpn_message_data_static -nes_message_data_static -staff_message_data_static -map_grand_static -map_48x85_static -map_i_static -code -ovl_title -ovl_select -ovl_opening -ovl_file_choose -ovl_kaleido_scope -ovl_player_actor -ovl_map_mark_data -ovl_En_Test -ovl_Arms_Hook -ovl_Arrow_Fire -ovl_Arrow_Ice -ovl_Arrow_Light -ovl_Bg_Bdan_Objects -ovl_Bg_Bdan_Switch -ovl_Bg_Bom_Guard -ovl_Bg_Bombwall -ovl_Bg_Bowl_Wall -ovl_Bg_Breakwall -ovl_Bg_Ddan_Jd -ovl_Bg_Ddan_Kd -ovl_Bg_Dodoago -ovl_Bg_Dy_Yoseizo -ovl_Bg_Ganon_Otyuka -ovl_Bg_Gate_Shutter -ovl_Bg_Gjyo_Bridge -ovl_Bg_Gnd_Darkmeiro -ovl_Bg_Gnd_Firemeiro -ovl_Bg_Gnd_Iceblock -ovl_Bg_Gnd_Nisekabe -ovl_Bg_Gnd_Soulmeiro -ovl_Bg_Haka -ovl_Bg_Haka_Gate -ovl_Bg_Haka_Huta -ovl_Bg_Haka_Megane -ovl_Bg_Haka_MeganeBG -ovl_Bg_Haka_Sgami -ovl_Bg_Haka_Ship -ovl_Bg_Haka_Trap -ovl_Bg_Haka_Tubo -ovl_Bg_Haka_Water -ovl_Bg_Haka_Zou -ovl_Bg_Heavy_Block -ovl_Bg_Hidan_Curtain -ovl_Bg_Hidan_Dalm -ovl_Bg_Hidan_Firewall -ovl_Bg_Hidan_Fslift -ovl_Bg_Hidan_Fwbig -ovl_Bg_Hidan_Hamstep -ovl_Bg_Hidan_Hrock -ovl_Bg_Hidan_Kousi -ovl_Bg_Hidan_Kowarerukabe -ovl_Bg_Hidan_Rock -ovl_Bg_Hidan_Rsekizou -ovl_Bg_Hidan_Sekizou -ovl_Bg_Hidan_Sima -ovl_Bg_Hidan_Syoku -ovl_Bg_Ice_Objects -ovl_Bg_Ice_Shelter -ovl_Bg_Ice_Shutter -ovl_Bg_Ice_Turara -ovl_Bg_Ingate -ovl_Bg_Jya_1flift -ovl_Bg_Jya_Amishutter -ovl_Bg_Jya_Bigmirror -ovl_Bg_Jya_Block -ovl_Bg_Jya_Bombchuiwa -ovl_Bg_Jya_Bombiwa -ovl_Bg_Jya_Cobra -ovl_Bg_Jya_Goroiwa -ovl_Bg_Jya_Haheniron -ovl_Bg_Jya_Ironobj -ovl_Bg_Jya_Kanaami -ovl_Bg_Jya_Lift -ovl_Bg_Jya_Megami -ovl_Bg_Jya_Zurerukabe -ovl_Bg_Menkuri_Eye -ovl_Bg_Menkuri_Kaiten -ovl_Bg_Menkuri_Nisekabe -ovl_Bg_Mizu_Bwall -ovl_Bg_Mizu_Movebg -ovl_Bg_Mizu_Shutter -ovl_Bg_Mizu_Uzu -ovl_Bg_Mizu_Water -ovl_Bg_Mjin -ovl_Bg_Mori_Bigst -ovl_Bg_Mori_Elevator -ovl_Bg_Mori_Hashigo -ovl_Bg_Mori_Hashira4 -ovl_Bg_Mori_Hineri -ovl_Bg_Mori_Idomizu -ovl_Bg_Mori_Kaitenkabe -ovl_Bg_Mori_Rakkatenjo -ovl_Bg_Po_Event -ovl_Bg_Po_Syokudai -ovl_Bg_Pushbox -ovl_Bg_Relay_Objects -ovl_Bg_Spot00_Break -ovl_Bg_Spot00_Hanebasi -ovl_Bg_Spot01_Fusya -ovl_Bg_Spot01_Idohashira -ovl_Bg_Spot01_Idomizu -ovl_Bg_Spot01_Idosoko -ovl_Bg_Spot01_Objects2 -ovl_Bg_Spot02_Objects -ovl_Bg_Spot03_Taki -ovl_Bg_Spot05_Soko -ovl_Bg_Spot06_Objects -ovl_Bg_Spot07_Taki -ovl_Bg_Spot08_Bakudankabe -ovl_Bg_Spot08_Iceblock -ovl_Bg_Spot09_Obj -ovl_Bg_Spot11_Bakudankabe -ovl_Bg_Spot11_Oasis -ovl_Bg_Spot12_Gate -ovl_Bg_Spot12_Saku -ovl_Bg_Spot15_Rrbox -ovl_Bg_Spot15_Saku -ovl_Bg_Spot16_Bombstone -ovl_Bg_Spot16_Doughnut -ovl_Bg_Spot17_Bakudankabe -ovl_Bg_Spot17_Funen -ovl_Bg_Spot18_Basket -ovl_Bg_Spot18_Futa -ovl_Bg_Spot18_Obj -ovl_Bg_Spot18_Shutter -ovl_Bg_Sst_Floor -ovl_Bg_Toki_Hikari -ovl_Bg_Toki_Swd -ovl_Bg_Treemouth -ovl_Bg_Umajump -ovl_Bg_Vb_Sima -ovl_Bg_Ydan_Hasi -ovl_Bg_Ydan_Maruta -ovl_Bg_Ydan_Sp -ovl_Bg_Zg -ovl_Boss_Dodongo -ovl_Boss_Fd -ovl_Boss_Fd2 -ovl_Boss_Ganon -ovl_Boss_Ganon2 -ovl_Boss_Ganondrof -ovl_Boss_Goma -ovl_Boss_Mo -ovl_Boss_Sst -ovl_Boss_Tw -ovl_Boss_Va -ovl_Demo_6K -ovl_Demo_Du -ovl_Demo_Ec -ovl_Demo_Effect -ovl_Demo_Ext -ovl_Demo_Geff -ovl_Demo_Gj -ovl_Demo_Go -ovl_Demo_Gt -ovl_Demo_Ik -ovl_Demo_Im -ovl_Demo_Kankyo -ovl_Demo_Kekkai -ovl_Demo_Sa -ovl_Demo_Shd -ovl_Demo_Tre_Lgt -ovl_Door_Ana -ovl_Door_Gerudo -ovl_Door_Killer -ovl_Door_Shutter -ovl_Door_Toki -ovl_Door_Warp1 -ovl_Efc_Erupc -ovl_Eff_Dust -ovl_Effect_Ss_Blast -ovl_Effect_Ss_Bomb -ovl_Effect_Ss_Bomb2 -ovl_Effect_Ss_Bubble -ovl_Effect_Ss_D_Fire -ovl_Effect_Ss_Dead_Db -ovl_Effect_Ss_Dead_Dd -ovl_Effect_Ss_Dead_Ds -ovl_Effect_Ss_Dead_Sound -ovl_Effect_Ss_Dt_Bubble -ovl_Effect_Ss_Dust -ovl_Effect_Ss_En_Fire -ovl_Effect_Ss_En_Ice -ovl_Effect_Ss_Extra -ovl_Effect_Ss_Fcircle -ovl_Effect_Ss_Fhg_Flash -ovl_Effect_Ss_Fire_Tail -ovl_Effect_Ss_G_Fire -ovl_Effect_Ss_G_Magma -ovl_Effect_Ss_G_Magma2 -ovl_Effect_Ss_G_Ripple -ovl_Effect_Ss_G_Spk -ovl_Effect_Ss_G_Splash -ovl_Effect_Ss_Hahen -ovl_Effect_Ss_HitMark -ovl_Effect_Ss_Ice_Piece -ovl_Effect_Ss_Ice_Smoke -ovl_Effect_Ss_K_Fire -ovl_Effect_Ss_Kakera -ovl_Effect_Ss_KiraKira -ovl_Effect_Ss_Lightning -ovl_Effect_Ss_Sibuki -ovl_Effect_Ss_Sibuki2 -ovl_Effect_Ss_Solder_Srch_Ball -ovl_Effect_Ss_Stick -ovl_Effect_Ss_Stone1 -ovl_Elf_Msg -ovl_Elf_Msg2 -ovl_En_Am -ovl_En_Ani -ovl_En_Anubice -ovl_En_Anubice_Fire -ovl_En_Anubice_Tag -ovl_En_Arow_Trap -ovl_En_Arrow -ovl_En_Attack_Niw -ovl_En_Ba -ovl_En_Bb -ovl_En_Bdfire -ovl_En_Bigokuta -ovl_En_Bili -ovl_En_Bird -ovl_En_Blkobj -ovl_En_Bom -ovl_En_Bom_Bowl_Man -ovl_En_Bom_Bowl_Pit -ovl_En_Bom_Chu -ovl_En_Bombf -ovl_En_Boom -ovl_En_Box -ovl_En_Brob -ovl_En_Bubble -ovl_En_Butte -ovl_En_Bw -ovl_En_Bx -ovl_En_Changer -ovl_En_Clear_Tag -ovl_En_Cow -ovl_En_Crow -ovl_En_Cs -ovl_En_Daiku -ovl_En_Daiku_Kakariko -ovl_En_Dekubaba -ovl_En_Dekunuts -ovl_En_Dh -ovl_En_Dha -ovl_En_Diving_Game -ovl_En_Dns -ovl_En_Dnt_Demo -ovl_En_Dnt_Jiji -ovl_En_Dnt_Nomal -ovl_En_Dodojr -ovl_En_Dodongo -ovl_En_Dog -ovl_En_Door -ovl_En_Ds -ovl_En_Du -ovl_En_Dy_Extra -ovl_En_Eg -ovl_En_Eiyer -ovl_En_Elf -ovl_En_Encount1 -ovl_En_Encount2 -ovl_En_Ex_Item -ovl_En_Ex_Ruppy -ovl_En_Fd -ovl_En_Fd_Fire -ovl_En_Fhg_Fire -ovl_En_Fire_Rock -ovl_En_Firefly -ovl_En_Fish -ovl_En_Floormas -ovl_En_Fr -ovl_En_Fu -ovl_En_Fw -ovl_En_Fz -ovl_En_G_Switch -ovl_En_Ganon_Mant -ovl_En_Ganon_Organ -ovl_En_Gb -ovl_En_Ge1 -ovl_En_Ge2 -ovl_En_Ge3 -ovl_En_GeldB -ovl_En_GirlA -ovl_En_Gm -ovl_En_Go -ovl_En_Go2 -ovl_En_Goma -ovl_En_Goroiwa -ovl_En_Gs -ovl_En_Guest -ovl_En_Hata -ovl_En_Heishi1 -ovl_En_Heishi2 -ovl_En_Heishi3 -ovl_En_Heishi4 -ovl_En_Hintnuts -ovl_En_Holl -ovl_En_Honotrap -ovl_En_Horse -ovl_En_Horse_Game_Check -ovl_En_Horse_Ganon -ovl_En_Horse_Link_Child -ovl_En_Horse_Normal -ovl_En_Horse_Zelda -ovl_En_Hs -ovl_En_Hs2 -ovl_En_Hy -ovl_En_Ice_Hono -ovl_En_Ik -ovl_En_In -ovl_En_Insect -ovl_En_Ishi -ovl_En_It -ovl_En_Jj -ovl_En_Js -ovl_En_Jsjutan -ovl_En_Kakasi -ovl_En_Kakasi2 -ovl_En_Kakasi3 -ovl_En_Kanban -ovl_En_Karebaba -ovl_En_Ko -ovl_En_Kusa -ovl_En_Kz -ovl_En_Light -ovl_En_Lightbox -ovl_En_M_Fire1 -ovl_En_M_Thunder -ovl_En_Ma1 -ovl_En_Ma2 -ovl_En_Ma3 -ovl_En_Mag -ovl_En_Mb -ovl_En_Md -ovl_En_Mk -ovl_En_Mm -ovl_En_Mm2 -ovl_En_Ms -ovl_En_Mu -ovl_En_Nb -ovl_En_Niw -ovl_En_Niw_Girl -ovl_En_Niw_Lady -ovl_En_Nutsball -ovl_En_Nwc -ovl_En_Ny -ovl_En_OE2 -ovl_En_Okarina_Effect -ovl_En_Okarina_Tag -ovl_En_Okuta -ovl_En_Ossan -ovl_En_Owl -ovl_En_Part -ovl_En_Peehat -ovl_En_Po_Desert -ovl_En_Po_Field -ovl_En_Po_Relay -ovl_En_Po_Sisters -ovl_En_Poh -ovl_En_Pu_box -ovl_En_Rd -ovl_En_Reeba -ovl_En_River_Sound -ovl_En_Rl -ovl_En_Rr -ovl_En_Ru1 -ovl_En_Ru2 -ovl_En_Sa -ovl_En_Sb -ovl_En_Scene_Change -ovl_En_Sda -ovl_En_Shopnuts -ovl_En_Si -ovl_En_Siofuki -ovl_En_Skb -ovl_En_Skj -ovl_En_Skjneedle -ovl_En_Ssh -ovl_En_St -ovl_En_Sth -ovl_En_Stream -ovl_En_Sw -ovl_En_Syateki_Itm -ovl_En_Syateki_Man -ovl_En_Syateki_Niw -ovl_En_Ta -ovl_En_Takara_Man -ovl_En_Tana -ovl_En_Tg -ovl_En_Tite -ovl_En_Tk -ovl_En_Torch -ovl_En_Torch2 -ovl_En_Toryo -ovl_En_Tp -ovl_En_Tr -ovl_En_Trap -ovl_En_Tubo_Trap -ovl_En_Vali -ovl_En_Vase -ovl_En_Vb_Ball -ovl_En_Viewer -ovl_En_Vm -ovl_En_Wall_Tubo -ovl_En_Wallmas -ovl_En_Weather_Tag -ovl_En_Weiyer -ovl_En_Wf -ovl_En_Wonder_Item -ovl_En_Wonder_Talk -ovl_En_Wonder_Talk2 -ovl_En_Wood02 -ovl_En_Xc -ovl_En_Yabusame_Mark -ovl_En_Yukabyun -ovl_En_Zf -ovl_En_Zl1 -ovl_En_Zl2 -ovl_En_Zl3 -ovl_En_Zl4 -ovl_En_Zo -ovl_En_fHG -ovl_End_Title -ovl_Fishing -ovl_Item_B_Heart -ovl_Item_Etcetera -ovl_Item_Inbox -ovl_Item_Ocarina -ovl_Item_Shield -ovl_Magic_Dark -ovl_Magic_Fire -ovl_Magic_Wind -ovl_Mir_Ray -ovl_Obj_Bean -ovl_Obj_Blockstop -ovl_Obj_Bombiwa -ovl_Obj_Comb -ovl_Obj_Dekujr -ovl_Obj_Elevator -ovl_Obj_Hamishi -ovl_Obj_Hana -ovl_Obj_Hsblock -ovl_Obj_Ice_Poly -ovl_Obj_Kibako -ovl_Obj_Kibako2 -ovl_Obj_Lift -ovl_Obj_Lightswitch -ovl_Obj_Makekinsuta -ovl_Obj_Makeoshihiki -ovl_Obj_Mure -ovl_Obj_Mure2 -ovl_Obj_Mure3 -ovl_Obj_Oshihiki -ovl_Obj_Roomtimer -ovl_Obj_Switch -ovl_Obj_Syokudai -ovl_Obj_Timeblock -ovl_Obj_Tsubo -ovl_Obj_Warp2block -ovl_Object_Kankyo -ovl_Oceff_Spot -ovl_Oceff_Storm -ovl_Oceff_Wipe -ovl_Oceff_Wipe2 -ovl_Oceff_Wipe3 -ovl_Oceff_Wipe4 -ovl_Shot_Sun -gameplay_keep -gameplay_field_keep -gameplay_dangeon_keep -gameplay_object_exchange_static -object_link_boy -object_link_child -object_box -object_human -object_okuta -object_poh -object_wallmaster -object_dy_obj -object_firefly -object_dodongo -object_fire -object_niw -object_tite -object_reeba -object_peehat -object_kingdodongo -object_horse -object_zf -object_goma -object_zl1 -object_gol -object_bubble -object_dodojr -object_torch2 -object_bl -object_tp -object_oA1 -object_st -object_bw -object_ei -object_horse_normal -object_oB1 -object_o_anime -object_spot04_objects -object_ddan_objects -object_hidan_objects -object_horse_ganon -object_oA2 -object_spot00_objects -object_mb -object_bombf -object_sk2 -object_oE1 -object_oE_anime -object_oE2 -object_ydan_objects -object_gnd -object_am -object_dekubaba -object_oA3 -object_oA4 -object_oA5 -object_oA6 -object_oA7 -object_jj -object_oA8 -object_oA9 -object_oB2 -object_oB3 -object_oB4 -object_horse_zelda -object_opening_demo1 -object_warp1 -object_b_heart -object_dekunuts -object_oE3 -object_oE4 -object_menkuri_objects -object_oE5 -object_oE6 -object_oE7 -object_oE8 -object_oE9 -object_oE10 -object_oE11 -object_oE12 -object_vali -object_oA10 -object_oA11 -object_mizu_objects -object_fhg -object_ossan -object_mori_hineri1 -object_Bb -object_toki_objects -object_yukabyun -object_zl2 -object_mjin -object_mjin_flash -object_mjin_dark -object_mjin_flame -object_mjin_ice -object_mjin_soul -object_mjin_wind -object_mjin_oka -object_haka_objects -object_spot06_objects -object_ice_objects -object_relay_objects -object_mori_hineri1a -object_mori_hineri2 -object_mori_hineri2a -object_mori_objects -object_mori_tex -object_spot08_obj -object_warp2 -object_hata -object_bird -object_wood02 -object_lightbox -object_pu_box -object_trap -object_vase -object_im -object_ta -object_tk -object_xc -object_vm -object_bv -object_hakach_objects -object_efc_crystal_light -object_efc_fire_ball -object_efc_flash -object_efc_lgt_shower -object_efc_star_field -object_god_lgt -object_light_ring -object_triforce_spot -object_medal -object_bdan_objects -object_sd -object_rd -object_po_sisters -object_heavy_object -object_gndd -object_fd -object_du -object_fw -object_horse_link_child -object_spot02_objects -object_haka -object_ru1 -object_syokudai -object_fd2 -object_dh -object_rl -object_efc_tw -object_demo_tre_lgt -object_gi_key -object_mir_ray -object_brob -object_gi_jewel -object_spot09_obj -object_spot18_obj -object_bdoor -object_spot17_obj -object_shop_dungen -object_nb -object_mo -object_sb -object_gi_melody -object_gi_heart -object_gi_compass -object_gi_bosskey -object_gi_medal -object_gi_nuts -object_sa -object_gi_hearts -object_gi_arrowcase -object_gi_bombpouch -object_in -object_tr -object_spot16_obj -object_oE1s -object_oE4s -object_os_anime -object_gi_bottle -object_gi_stick -object_gi_map -object_oF1d_map -object_ru2 -object_gi_shield_1 -object_dekujr -object_gi_magicpot -object_gi_bomb_1 -object_oF1s -object_ma2 -object_gi_purse -object_hni -object_tw -object_rr -object_bxa -object_anubice -object_gi_gerudo -object_gi_arrow -object_gi_bomb_2 -object_gi_egg -object_gi_scale -object_gi_shield_2 -object_gi_hookshot -object_gi_ocarina -object_gi_milk -object_ma1 -object_ganon -object_sst -object_ny -object_fr -object_gi_pachinko -object_gi_boomerang -object_gi_bow -object_gi_glasses -object_gi_liquid -object_ani -object_demo_6k -object_gi_shield_3 -object_gi_letter -object_spot15_obj -object_jya_obj -object_gi_clothes -object_gi_bean -object_gi_fish -object_gi_saw -object_gi_hammer -object_gi_grass -object_gi_longsword -object_spot01_objects -object_md -object_km1 -object_kw1 -object_zo -object_kz -object_umajump -object_masterkokiri -object_masterkokirihead -object_mastergolon -object_masterzoora -object_aob -object_ik -object_ahg -object_cne -object_gi_niwatori -object_skj -object_gi_bottle_letter -object_bji -object_bba -object_gi_ocarina_0 -object_ds -object_ane -object_boj -object_spot03_object -object_spot07_object -object_fz -object_bob -object_ge1 -object_yabusame_point -object_gi_boots_2 -object_gi_seed -object_gnd_magic -object_d_elevator -object_d_hsblock -object_d_lift -object_mamenoki -object_goroiwa -object_toryo -object_daiku -object_nwc -object_blkobj -object_gm -object_ms -object_hs -object_ingate -object_lightswitch -object_kusa -object_tsubo -object_gi_gloves -object_gi_coin -object_kanban -object_gjyo_objects -object_owl -object_mk -object_fu -object_gi_ki_tan_mask -object_gi_redead_mask -object_gi_skj_mask -object_gi_rabit_mask -object_gi_truth_mask -object_ganon_objects -object_siofuki -object_stream -object_mm -object_fa -object_os -object_gi_eye_lotion -object_gi_powder -object_gi_mushroom -object_gi_ticketstone -object_gi_brokensword -object_js -object_cs -object_gi_prescription -object_gi_bracelet -object_gi_soldout -object_gi_frog -object_mag -object_door_gerudo -object_gt -object_efc_erupc -object_zl2_anime1 -object_zl2_anime2 -object_gi_golonmask -object_gi_zoramask -object_gi_gerudomask -object_ganon2 -object_ka -object_ts -object_zg -object_gi_hoverboots -object_gi_m_arrow -object_ds2 -object_ec -object_fish -object_gi_sutaru -object_gi_goddess -object_ssh -object_bigokuta -object_bg -object_spot05_objects -object_spot12_obj -object_bombiwa -object_hintnuts -object_rs -object_spot00_break -object_gla -object_shopnuts -object_geldb -object_gr -object_dog -object_jya_iron -object_jya_door -object_spot01_objects2 -object_spot11_obj -object_kibako2 -object_dns -object_dnk -object_gi_fire -object_gi_insect -object_gi_butterfly -object_gi_ghost -object_gi_soul -object_bowl -object_po_field -object_demo_kekkai -object_efc_doughnut -object_gi_dekupouch -object_ganon_anime1 -object_ganon_anime2 -object_ganon_anime3 -object_gi_rupy -object_spot01_matoya -object_spot01_matoyab -object_po_composer -object_mu -object_wf -object_skb -object_gj -object_geff -object_haka_door -object_gs -object_ps -object_bwall -object_crow -object_cow -object_cob -object_gi_sword_1 -object_door_killer -object_ouke_haka -object_timeblock -object_zl4 -g_pn_01 -g_pn_02 -g_pn_03 -g_pn_04 -g_pn_05 -g_pn_06 -g_pn_07 -g_pn_08 -g_pn_09 -g_pn_10 -g_pn_11 -g_pn_12 -g_pn_13 -g_pn_14 -g_pn_15 -g_pn_16 -g_pn_17 -g_pn_18 -g_pn_19 -g_pn_20 -g_pn_21 -g_pn_22 -g_pn_23 -g_pn_24 -g_pn_25 -g_pn_26 -g_pn_27 -g_pn_28 -g_pn_29 -g_pn_30 -g_pn_31 -g_pn_32 -g_pn_33 -g_pn_34 -g_pn_35 -g_pn_36 -g_pn_37 -g_pn_38 -g_pn_39 -g_pn_40 -g_pn_41 -g_pn_42 -g_pn_43 -g_pn_44 -g_pn_45 -g_pn_46 -g_pn_47 -g_pn_48 -g_pn_49 -g_pn_50 -g_pn_51 -g_pn_52 -g_pn_53 -g_pn_54 -g_pn_55 -g_pn_56 -g_pn_57 -z_select_static -nintendo_rogo_static -title_static -parameter_static -vr_fine0_static -vr_fine0_pal_static -vr_fine1_static -vr_fine1_pal_static -vr_fine2_static -vr_fine2_pal_static -vr_fine3_static -vr_fine3_pal_static -vr_cloud0_static -vr_cloud0_pal_static -vr_cloud1_static -vr_cloud1_pal_static -vr_cloud2_static -vr_cloud2_pal_static -vr_cloud3_static -vr_cloud3_pal_static -vr_holy0_static -vr_holy0_pal_static -vr_holy1_static -vr_holy1_pal_static -vr_MDVR_static -vr_MDVR_pal_static -vr_MNVR_static -vr_MNVR_pal_static -vr_RUVR_static -vr_RUVR_pal_static -vr_LHVR_static -vr_LHVR_pal_static -vr_KHVR_static -vr_KHVR_pal_static -vr_K3VR_static -vr_K3VR_pal_static -vr_K4VR_static -vr_K4VR_pal_static -vr_K5VR_static -vr_K5VR_pal_static -vr_SP1a_static -vr_SP1a_pal_static -vr_MLVR_static -vr_MLVR_pal_static -vr_KKRVR_static -vr_KKRVR_pal_static -vr_KR3VR_static -vr_KR3VR_pal_static -vr_IPVR_static -vr_IPVR_pal_static -vr_KSVR_static -vr_KSVR_pal_static -vr_GLVR_static -vr_GLVR_pal_static -vr_ZRVR_static -vr_ZRVR_pal_static -vr_DGVR_static -vr_DGVR_pal_static -vr_ALVR_static -vr_ALVR_pal_static -vr_NSVR_static -vr_NSVR_pal_static -vr_LBVR_static -vr_LBVR_pal_static -vr_TTVR_static -vr_TTVR_pal_static -vr_FCVR_static -vr_FCVR_pal_static -elf_message_field -elf_message_ydan -ydan_scene -ydan_room_0 -ydan_room_1 -ydan_room_2 -ydan_room_3 -ydan_room_4 -ydan_room_5 -ydan_room_6 -ydan_room_7 -ydan_room_8 -ydan_room_9 -ydan_room_10 -ydan_room_11 -ddan_scene -ddan_room_0 -ddan_room_1 -ddan_room_2 -ddan_room_3 -ddan_room_4 -ddan_room_5 -ddan_room_6 -ddan_room_7 -ddan_room_8 -ddan_room_9 -ddan_room_10 -ddan_room_11 -ddan_room_12 -ddan_room_13 -ddan_room_14 -ddan_room_15 -ddan_room_16 -bdan_scene -bdan_room_0 -bdan_room_1 -bdan_room_2 -bdan_room_3 -bdan_room_4 -bdan_room_5 -bdan_room_6 -bdan_room_7 -bdan_room_8 -bdan_room_9 -bdan_room_10 -bdan_room_11 -bdan_room_12 -bdan_room_13 -bdan_room_14 -bdan_room_15 -Bmori1_scene -Bmori1_room_0 -Bmori1_room_1 -Bmori1_room_2 -Bmori1_room_3 -Bmori1_room_4 -Bmori1_room_5 -Bmori1_room_6 -Bmori1_room_7 -Bmori1_room_8 -Bmori1_room_9 -Bmori1_room_10 -Bmori1_room_11 -Bmori1_room_12 -Bmori1_room_13 -Bmori1_room_14 -Bmori1_room_15 -Bmori1_room_16 -Bmori1_room_17 -Bmori1_room_18 -Bmori1_room_19 -Bmori1_room_20 -Bmori1_room_21 -Bmori1_room_22 -HIDAN_scene -HIDAN_room_0 -HIDAN_room_1 -HIDAN_room_2 -HIDAN_room_3 -HIDAN_room_4 -HIDAN_room_5 -HIDAN_room_6 -HIDAN_room_7 -HIDAN_room_8 -HIDAN_room_9 -HIDAN_room_10 -HIDAN_room_11 -HIDAN_room_12 -HIDAN_room_13 -HIDAN_room_14 -HIDAN_room_15 -HIDAN_room_16 -HIDAN_room_17 -HIDAN_room_18 -HIDAN_room_19 -HIDAN_room_20 -HIDAN_room_21 -HIDAN_room_22 -HIDAN_room_23 -HIDAN_room_24 -HIDAN_room_25 -HIDAN_room_26 -MIZUsin_scene -MIZUsin_room_0 -MIZUsin_room_1 -MIZUsin_room_2 -MIZUsin_room_3 -MIZUsin_room_4 -MIZUsin_room_5 -MIZUsin_room_6 -MIZUsin_room_7 -MIZUsin_room_8 -MIZUsin_room_9 -MIZUsin_room_10 -MIZUsin_room_11 -MIZUsin_room_12 -MIZUsin_room_13 -MIZUsin_room_14 -MIZUsin_room_15 -MIZUsin_room_16 -MIZUsin_room_17 -MIZUsin_room_18 -MIZUsin_room_19 -MIZUsin_room_20 -MIZUsin_room_21 -MIZUsin_room_22 -jyasinzou_scene -jyasinzou_room_0 -jyasinzou_room_1 -jyasinzou_room_2 -jyasinzou_room_3 -jyasinzou_room_4 -jyasinzou_room_5 -jyasinzou_room_6 -jyasinzou_room_7 -jyasinzou_room_8 -jyasinzou_room_9 -jyasinzou_room_10 -jyasinzou_room_11 -jyasinzou_room_12 -jyasinzou_room_13 -jyasinzou_room_14 -jyasinzou_room_15 -jyasinzou_room_16 -jyasinzou_room_17 -jyasinzou_room_18 -jyasinzou_room_19 -jyasinzou_room_20 -jyasinzou_room_21 -jyasinzou_room_22 -jyasinzou_room_23 -jyasinzou_room_24 -jyasinzou_room_25 -jyasinzou_room_26 -jyasinzou_room_27 -jyasinzou_room_28 -HAKAdan_scene -HAKAdan_room_0 -HAKAdan_room_1 -HAKAdan_room_2 -HAKAdan_room_3 -HAKAdan_room_4 -HAKAdan_room_5 -HAKAdan_room_6 -HAKAdan_room_7 -HAKAdan_room_8 -HAKAdan_room_9 -HAKAdan_room_10 -HAKAdan_room_11 -HAKAdan_room_12 -HAKAdan_room_13 -HAKAdan_room_14 -HAKAdan_room_15 -HAKAdan_room_16 -HAKAdan_room_17 -HAKAdan_room_18 -HAKAdan_room_19 -HAKAdan_room_20 -HAKAdan_room_21 -HAKAdan_room_22 -HAKAdanCH_scene -HAKAdanCH_room_0 -HAKAdanCH_room_1 -HAKAdanCH_room_2 -HAKAdanCH_room_3 -HAKAdanCH_room_4 -HAKAdanCH_room_5 -HAKAdanCH_room_6 -ice_doukutu_scene -ice_doukutu_room_0 -ice_doukutu_room_1 -ice_doukutu_room_2 -ice_doukutu_room_3 -ice_doukutu_room_4 -ice_doukutu_room_5 -ice_doukutu_room_6 -ice_doukutu_room_7 -ice_doukutu_room_8 -ice_doukutu_room_9 -ice_doukutu_room_10 -ice_doukutu_room_11 -men_scene -men_room_0 -men_room_1 -men_room_2 -men_room_3 -men_room_4 -men_room_5 -men_room_6 -men_room_7 -men_room_8 -men_room_9 -men_room_10 -ganontika_scene -ganontika_room_0 -ganontika_room_1 -ganontika_room_2 -ganontika_room_3 -ganontika_room_4 -ganontika_room_5 -ganontika_room_6 -ganontika_room_7 -ganontika_room_8 -ganontika_room_9 -ganontika_room_10 -ganontika_room_11 -ganontika_room_12 -ganontika_room_13 -ganontika_room_14 -ganontika_room_15 -ganontika_room_16 -ganontika_room_17 -ganontika_room_18 -ganontika_room_19 -spot00_scene -spot00_room_0 -spot01_scene -spot01_room_0 -spot02_scene -spot02_room_0 -spot02_room_1 -spot03_scene -spot03_room_0 -spot03_room_1 -spot04_scene -spot04_room_0 -spot04_room_1 -spot04_room_2 -spot05_scene -spot05_room_0 -spot06_scene -spot06_room_0 -spot07_scene -spot07_room_0 -spot07_room_1 -spot08_scene -spot08_room_0 -spot09_scene -spot09_room_0 -spot10_scene -spot10_room_0 -spot10_room_1 -spot10_room_2 -spot10_room_3 -spot10_room_4 -spot10_room_5 -spot10_room_6 -spot10_room_7 -spot10_room_8 -spot10_room_9 -spot11_scene -spot11_room_0 -spot12_scene -spot12_room_0 -spot12_room_1 -spot13_scene -spot13_room_0 -spot13_room_1 -spot15_scene -spot15_room_0 -spot16_scene -spot16_room_0 -spot17_scene -spot17_room_0 -spot17_room_1 -spot18_scene -spot18_room_0 -spot18_room_1 -spot18_room_2 -spot18_room_3 -market_day_scene -market_day_room_0 -market_night_scene -market_night_room_0 -kenjyanoma_scene -kenjyanoma_room_0 -tokinoma_scene -tokinoma_room_0 -tokinoma_room_1 -link_home_scene -link_home_room_0 -kokiri_shop_scene -kokiri_shop_room_0 -kokiri_home_scene -kokiri_home_room_0 -kakusiana_scene -kakusiana_room_0 -kakusiana_room_1 -kakusiana_room_2 -kakusiana_room_3 -kakusiana_room_4 -kakusiana_room_5 -kakusiana_room_6 -kakusiana_room_7 -kakusiana_room_8 -kakusiana_room_9 -kakusiana_room_10 -kakusiana_room_11 -kakusiana_room_12 -kakusiana_room_13 -entra_scene -entra_room_0 -moribossroom_scene -moribossroom_room_0 -moribossroom_room_1 -syatekijyou_scene -syatekijyou_room_0 -shop1_scene -shop1_room_0 -hairal_niwa_scene -hairal_niwa_room_0 -ganon_tou_scene -ganon_tou_room_0 -market_alley_scene -market_alley_room_0 -spot20_scene -spot20_room_0 -market_ruins_scene -market_ruins_room_0 -entra_n_scene -entra_n_room_0 -enrui_scene -enrui_room_0 -market_alley_n_scene -market_alley_n_room_0 -hiral_demo_scene -hiral_demo_room_0 -kokiri_home3_scene -kokiri_home3_room_0 -malon_stable_scene -malon_stable_room_0 -kakariko_scene -kakariko_room_0 -bdan_boss_scene -bdan_boss_room_0 -bdan_boss_room_1 -FIRE_bs_scene -FIRE_bs_room_0 -FIRE_bs_room_1 -hut_scene -hut_room_0 -daiyousei_izumi_scene -daiyousei_izumi_room_0 -hakaana_scene -hakaana_room_0 -yousei_izumi_tate_scene -yousei_izumi_tate_room_0 -yousei_izumi_yoko_scene -yousei_izumi_yoko_room_0 -golon_scene -golon_room_0 -zoora_scene -zoora_room_0 -drag_scene -drag_room_0 -alley_shop_scene -alley_shop_room_0 -night_shop_scene -night_shop_room_0 -impa_scene -impa_room_0 -labo_scene -labo_room_0 -tent_scene -tent_room_0 -nakaniwa_scene -nakaniwa_room_0 -ddan_boss_scene -ddan_boss_room_0 -ddan_boss_room_1 -ydan_boss_scene -ydan_boss_room_0 -ydan_boss_room_1 -HAKAdan_bs_scene -HAKAdan_bs_room_0 -HAKAdan_bs_room_1 -MIZUsin_bs_scene -MIZUsin_bs_room_0 -MIZUsin_bs_room_1 -ganon_scene -ganon_room_0 -ganon_room_1 -ganon_room_2 -ganon_room_3 -ganon_room_4 -ganon_room_5 -ganon_room_6 -ganon_room_7 -ganon_room_8 -ganon_room_9 -ganon_boss_scene -ganon_boss_room_0 -jyasinboss_scene -jyasinboss_room_0 -jyasinboss_room_1 -jyasinboss_room_2 -jyasinboss_room_3 -kokiri_home4_scene -kokiri_home4_room_0 -kokiri_home5_scene -kokiri_home5_room_0 -ganon_final_scene -ganon_final_room_0 -kakariko3_scene -kakariko3_room_0 -hakasitarelay_scene -hakasitarelay_room_0 -hakasitarelay_room_1 -hakasitarelay_room_2 -hakasitarelay_room_3 -hakasitarelay_room_4 -hakasitarelay_room_5 -hakasitarelay_room_6 -shrine_scene -shrine_room_0 -turibori_scene -turibori_room_0 -shrine_n_scene -shrine_n_room_0 -shrine_r_scene -shrine_r_room_0 -hakaana2_scene -hakaana2_room_0 -gerudoway_scene -gerudoway_room_0 -gerudoway_room_1 -gerudoway_room_2 -gerudoway_room_3 -gerudoway_room_4 -gerudoway_room_5 -hairal_niwa_n_scene -hairal_niwa_n_room_0 -bowling_scene -bowling_room_0 -hakaana_ouke_scene -hakaana_ouke_room_0 -hakaana_ouke_room_1 -hakaana_ouke_room_2 -hylia_labo_scene -hylia_labo_room_0 -souko_scene -souko_room_0 -souko_room_1 -souko_room_2 -miharigoya_scene -miharigoya_room_0 -mahouya_scene -mahouya_room_0 -takaraya_scene -takaraya_room_0 -takaraya_room_1 -takaraya_room_2 -takaraya_room_3 -takaraya_room_4 -takaraya_room_5 -takaraya_room_6 -ganon_sonogo_scene -ganon_sonogo_room_0 -ganon_sonogo_room_1 -ganon_sonogo_room_2 -ganon_sonogo_room_3 -ganon_sonogo_room_4 -ganon_demo_scene -ganon_demo_room_0 -face_shop_scene -face_shop_room_0 -kinsuta_scene -kinsuta_room_0 -ganontikasonogo_scene -ganontikasonogo_room_0 -ganontikasonogo_room_1 -bump_texture_static -anime_model_1_static -anime_model_2_static -anime_model_3_static -anime_model_4_static -anime_model_5_static -anime_model_6_static -anime_texture_1_static -anime_texture_2_static -anime_texture_3_static -anime_texture_4_static -anime_texture_5_static -anime_texture_6_static -softsprite_matrix_static \ No newline at end of file diff --git a/OTRExporter/CFG/filelists/gamecube_pal.txt b/OTRExporter/CFG/filelists/gamecube_pal.txt deleted file mode 100644 index c9746c1da..000000000 --- a/OTRExporter/CFG/filelists/gamecube_pal.txt +++ /dev/null @@ -1,1510 +0,0 @@ -makerom -boot -dmadata -Audiobank -Audioseq -Audiotable -link_animetion -icon_item_static -icon_item_24_static -icon_item_field_static -icon_item_dungeon_static -icon_item_gameover_static -icon_item_nes_static -icon_item_ger_static -icon_item_fra_static -item_name_static -map_name_static -do_action_static -message_static -message_texture_static -nes_font_static -nes_message_data_static -ger_message_data_static -fra_message_data_static -staff_message_data_static -map_grand_static -map_48x85_static -map_i_static -code -ovl_title -ovl_select -ovl_opening -ovl_file_choose -ovl_kaleido_scope -ovl_player_actor -ovl_map_mark_data -ovl_En_Test -ovl_Arms_Hook -ovl_Arrow_Fire -ovl_Arrow_Ice -ovl_Arrow_Light -ovl_Bg_Bdan_Objects -ovl_Bg_Bdan_Switch -ovl_Bg_Bom_Guard -ovl_Bg_Bombwall -ovl_Bg_Bowl_Wall -ovl_Bg_Breakwall -ovl_Bg_Ddan_Jd -ovl_Bg_Ddan_Kd -ovl_Bg_Dodoago -ovl_Bg_Dy_Yoseizo -ovl_Bg_Ganon_Otyuka -ovl_Bg_Gate_Shutter -ovl_Bg_Gjyo_Bridge -ovl_Bg_Gnd_Darkmeiro -ovl_Bg_Gnd_Firemeiro -ovl_Bg_Gnd_Iceblock -ovl_Bg_Gnd_Nisekabe -ovl_Bg_Gnd_Soulmeiro -ovl_Bg_Haka -ovl_Bg_Haka_Gate -ovl_Bg_Haka_Huta -ovl_Bg_Haka_Megane -ovl_Bg_Haka_MeganeBG -ovl_Bg_Haka_Sgami -ovl_Bg_Haka_Ship -ovl_Bg_Haka_Trap -ovl_Bg_Haka_Tubo -ovl_Bg_Haka_Water -ovl_Bg_Haka_Zou -ovl_Bg_Heavy_Block -ovl_Bg_Hidan_Curtain -ovl_Bg_Hidan_Dalm -ovl_Bg_Hidan_Firewall -ovl_Bg_Hidan_Fslift -ovl_Bg_Hidan_Fwbig -ovl_Bg_Hidan_Hamstep -ovl_Bg_Hidan_Hrock -ovl_Bg_Hidan_Kousi -ovl_Bg_Hidan_Kowarerukabe -ovl_Bg_Hidan_Rock -ovl_Bg_Hidan_Rsekizou -ovl_Bg_Hidan_Sekizou -ovl_Bg_Hidan_Sima -ovl_Bg_Hidan_Syoku -ovl_Bg_Ice_Objects -ovl_Bg_Ice_Shelter -ovl_Bg_Ice_Shutter -ovl_Bg_Ice_Turara -ovl_Bg_Ingate -ovl_Bg_Jya_1flift -ovl_Bg_Jya_Amishutter -ovl_Bg_Jya_Bigmirror -ovl_Bg_Jya_Block -ovl_Bg_Jya_Bombchuiwa -ovl_Bg_Jya_Bombiwa -ovl_Bg_Jya_Cobra -ovl_Bg_Jya_Goroiwa -ovl_Bg_Jya_Haheniron -ovl_Bg_Jya_Ironobj -ovl_Bg_Jya_Kanaami -ovl_Bg_Jya_Lift -ovl_Bg_Jya_Megami -ovl_Bg_Jya_Zurerukabe -ovl_Bg_Menkuri_Eye -ovl_Bg_Menkuri_Kaiten -ovl_Bg_Menkuri_Nisekabe -ovl_Bg_Mizu_Bwall -ovl_Bg_Mizu_Movebg -ovl_Bg_Mizu_Shutter -ovl_Bg_Mizu_Uzu -ovl_Bg_Mizu_Water -ovl_Bg_Mjin -ovl_Bg_Mori_Bigst -ovl_Bg_Mori_Elevator -ovl_Bg_Mori_Hashigo -ovl_Bg_Mori_Hashira4 -ovl_Bg_Mori_Hineri -ovl_Bg_Mori_Idomizu -ovl_Bg_Mori_Kaitenkabe -ovl_Bg_Mori_Rakkatenjo -ovl_Bg_Po_Event -ovl_Bg_Po_Syokudai -ovl_Bg_Pushbox -ovl_Bg_Relay_Objects -ovl_Bg_Spot00_Break -ovl_Bg_Spot00_Hanebasi -ovl_Bg_Spot01_Fusya -ovl_Bg_Spot01_Idohashira -ovl_Bg_Spot01_Idomizu -ovl_Bg_Spot01_Idosoko -ovl_Bg_Spot01_Objects2 -ovl_Bg_Spot02_Objects -ovl_Bg_Spot03_Taki -ovl_Bg_Spot05_Soko -ovl_Bg_Spot06_Objects -ovl_Bg_Spot07_Taki -ovl_Bg_Spot08_Bakudankabe -ovl_Bg_Spot08_Iceblock -ovl_Bg_Spot09_Obj -ovl_Bg_Spot11_Bakudankabe -ovl_Bg_Spot11_Oasis -ovl_Bg_Spot12_Gate -ovl_Bg_Spot12_Saku -ovl_Bg_Spot15_Rrbox -ovl_Bg_Spot15_Saku -ovl_Bg_Spot16_Bombstone -ovl_Bg_Spot16_Doughnut -ovl_Bg_Spot17_Bakudankabe -ovl_Bg_Spot17_Funen -ovl_Bg_Spot18_Basket -ovl_Bg_Spot18_Futa -ovl_Bg_Spot18_Obj -ovl_Bg_Spot18_Shutter -ovl_Bg_Sst_Floor -ovl_Bg_Toki_Hikari -ovl_Bg_Toki_Swd -ovl_Bg_Treemouth -ovl_Bg_Umajump -ovl_Bg_Vb_Sima -ovl_Bg_Ydan_Hasi -ovl_Bg_Ydan_Maruta -ovl_Bg_Ydan_Sp -ovl_Bg_Zg -ovl_Boss_Dodongo -ovl_Boss_Fd -ovl_Boss_Fd2 -ovl_Boss_Ganon -ovl_Boss_Ganon2 -ovl_Boss_Ganondrof -ovl_Boss_Goma -ovl_Boss_Mo -ovl_Boss_Sst -ovl_Boss_Tw -ovl_Boss_Va -ovl_Demo_6K -ovl_Demo_Du -ovl_Demo_Ec -ovl_Demo_Effect -ovl_Demo_Ext -ovl_Demo_Geff -ovl_Demo_Gj -ovl_Demo_Go -ovl_Demo_Gt -ovl_Demo_Ik -ovl_Demo_Im -ovl_Demo_Kankyo -ovl_Demo_Kekkai -ovl_Demo_Sa -ovl_Demo_Shd -ovl_Demo_Tre_Lgt -ovl_Door_Ana -ovl_Door_Gerudo -ovl_Door_Killer -ovl_Door_Shutter -ovl_Door_Toki -ovl_Door_Warp1 -ovl_Efc_Erupc -ovl_Eff_Dust -ovl_Effect_Ss_Blast -ovl_Effect_Ss_Bomb -ovl_Effect_Ss_Bomb2 -ovl_Effect_Ss_Bubble -ovl_Effect_Ss_D_Fire -ovl_Effect_Ss_Dead_Db -ovl_Effect_Ss_Dead_Dd -ovl_Effect_Ss_Dead_Ds -ovl_Effect_Ss_Dead_Sound -ovl_Effect_Ss_Dt_Bubble -ovl_Effect_Ss_Dust -ovl_Effect_Ss_En_Fire -ovl_Effect_Ss_En_Ice -ovl_Effect_Ss_Extra -ovl_Effect_Ss_Fcircle -ovl_Effect_Ss_Fhg_Flash -ovl_Effect_Ss_Fire_Tail -ovl_Effect_Ss_G_Fire -ovl_Effect_Ss_G_Magma -ovl_Effect_Ss_G_Magma2 -ovl_Effect_Ss_G_Ripple -ovl_Effect_Ss_G_Spk -ovl_Effect_Ss_G_Splash -ovl_Effect_Ss_Hahen -ovl_Effect_Ss_HitMark -ovl_Effect_Ss_Ice_Piece -ovl_Effect_Ss_Ice_Smoke -ovl_Effect_Ss_K_Fire -ovl_Effect_Ss_Kakera -ovl_Effect_Ss_KiraKira -ovl_Effect_Ss_Lightning -ovl_Effect_Ss_Sibuki -ovl_Effect_Ss_Sibuki2 -ovl_Effect_Ss_Solder_Srch_Ball -ovl_Effect_Ss_Stick -ovl_Effect_Ss_Stone1 -ovl_Elf_Msg -ovl_Elf_Msg2 -ovl_En_Am -ovl_En_Ani -ovl_En_Anubice -ovl_En_Anubice_Fire -ovl_En_Anubice_Tag -ovl_En_Arow_Trap -ovl_En_Arrow -ovl_En_Attack_Niw -ovl_En_Ba -ovl_En_Bb -ovl_En_Bdfire -ovl_En_Bigokuta -ovl_En_Bili -ovl_En_Bird -ovl_En_Blkobj -ovl_En_Bom -ovl_En_Bom_Bowl_Man -ovl_En_Bom_Bowl_Pit -ovl_En_Bom_Chu -ovl_En_Bombf -ovl_En_Boom -ovl_En_Box -ovl_En_Brob -ovl_En_Bubble -ovl_En_Butte -ovl_En_Bw -ovl_En_Bx -ovl_En_Changer -ovl_En_Clear_Tag -ovl_En_Cow -ovl_En_Crow -ovl_En_Cs -ovl_En_Daiku -ovl_En_Daiku_Kakariko -ovl_En_Dekubaba -ovl_En_Dekunuts -ovl_En_Dh -ovl_En_Dha -ovl_En_Diving_Game -ovl_En_Dns -ovl_En_Dnt_Demo -ovl_En_Dnt_Jiji -ovl_En_Dnt_Nomal -ovl_En_Dodojr -ovl_En_Dodongo -ovl_En_Dog -ovl_En_Door -ovl_En_Ds -ovl_En_Du -ovl_En_Dy_Extra -ovl_En_Eg -ovl_En_Eiyer -ovl_En_Elf -ovl_En_Encount1 -ovl_En_Encount2 -ovl_En_Ex_Item -ovl_En_Ex_Ruppy -ovl_En_Fd -ovl_En_Fd_Fire -ovl_En_Fhg_Fire -ovl_En_Fire_Rock -ovl_En_Firefly -ovl_En_Fish -ovl_En_Floormas -ovl_En_Fr -ovl_En_Fu -ovl_En_Fw -ovl_En_Fz -ovl_En_G_Switch -ovl_En_Ganon_Mant -ovl_En_Ganon_Organ -ovl_En_Gb -ovl_En_Ge1 -ovl_En_Ge2 -ovl_En_Ge3 -ovl_En_GeldB -ovl_En_GirlA -ovl_En_Gm -ovl_En_Go -ovl_En_Go2 -ovl_En_Goma -ovl_En_Goroiwa -ovl_En_Gs -ovl_En_Guest -ovl_En_Hata -ovl_En_Heishi1 -ovl_En_Heishi2 -ovl_En_Heishi3 -ovl_En_Heishi4 -ovl_En_Hintnuts -ovl_En_Holl -ovl_En_Honotrap -ovl_En_Horse -ovl_En_Horse_Game_Check -ovl_En_Horse_Ganon -ovl_En_Horse_Link_Child -ovl_En_Horse_Normal -ovl_En_Horse_Zelda -ovl_En_Hs -ovl_En_Hs2 -ovl_En_Hy -ovl_En_Ice_Hono -ovl_En_Ik -ovl_En_In -ovl_En_Insect -ovl_En_Ishi -ovl_En_It -ovl_En_Jj -ovl_En_Js -ovl_En_Jsjutan -ovl_En_Kakasi -ovl_En_Kakasi2 -ovl_En_Kakasi3 -ovl_En_Kanban -ovl_En_Karebaba -ovl_En_Ko -ovl_En_Kusa -ovl_En_Kz -ovl_En_Light -ovl_En_Lightbox -ovl_En_M_Fire1 -ovl_En_M_Thunder -ovl_En_Ma1 -ovl_En_Ma2 -ovl_En_Ma3 -ovl_En_Mag -ovl_En_Mb -ovl_En_Md -ovl_En_Mk -ovl_En_Mm -ovl_En_Mm2 -ovl_En_Ms -ovl_En_Mu -ovl_En_Nb -ovl_En_Niw -ovl_En_Niw_Girl -ovl_En_Niw_Lady -ovl_En_Nutsball -ovl_En_Nwc -ovl_En_Ny -ovl_En_OE2 -ovl_En_Okarina_Effect -ovl_En_Okarina_Tag -ovl_En_Okuta -ovl_En_Ossan -ovl_En_Owl -ovl_En_Part -ovl_En_Peehat -ovl_En_Po_Desert -ovl_En_Po_Field -ovl_En_Po_Relay -ovl_En_Po_Sisters -ovl_En_Poh -ovl_En_Pu_box -ovl_En_Rd -ovl_En_Reeba -ovl_En_River_Sound -ovl_En_Rl -ovl_En_Rr -ovl_En_Ru1 -ovl_En_Ru2 -ovl_En_Sa -ovl_En_Sb -ovl_En_Scene_Change -ovl_En_Sda -ovl_En_Shopnuts -ovl_En_Si -ovl_En_Siofuki -ovl_En_Skb -ovl_En_Skj -ovl_En_Skjneedle -ovl_En_Ssh -ovl_En_St -ovl_En_Sth -ovl_En_Stream -ovl_En_Sw -ovl_En_Syateki_Itm -ovl_En_Syateki_Man -ovl_En_Syateki_Niw -ovl_En_Ta -ovl_En_Takara_Man -ovl_En_Tana -ovl_En_Tg -ovl_En_Tite -ovl_En_Tk -ovl_En_Torch -ovl_En_Torch2 -ovl_En_Toryo -ovl_En_Tp -ovl_En_Tr -ovl_En_Trap -ovl_En_Tubo_Trap -ovl_En_Vali -ovl_En_Vase -ovl_En_Vb_Ball -ovl_En_Viewer -ovl_En_Vm -ovl_En_Wall_Tubo -ovl_En_Wallmas -ovl_En_Weather_Tag -ovl_En_Weiyer -ovl_En_Wf -ovl_En_Wonder_Item -ovl_En_Wonder_Talk -ovl_En_Wonder_Talk2 -ovl_En_Wood02 -ovl_En_Xc -ovl_En_Yabusame_Mark -ovl_En_Yukabyun -ovl_En_Zf -ovl_En_Zl1 -ovl_En_Zl2 -ovl_En_Zl3 -ovl_En_Zl4 -ovl_En_Zo -ovl_En_fHG -ovl_End_Title -ovl_Fishing -ovl_Item_B_Heart -ovl_Item_Etcetera -ovl_Item_Inbox -ovl_Item_Ocarina -ovl_Item_Shield -ovl_Magic_Dark -ovl_Magic_Fire -ovl_Magic_Wind -ovl_Mir_Ray -ovl_Obj_Bean -ovl_Obj_Blockstop -ovl_Obj_Bombiwa -ovl_Obj_Comb -ovl_Obj_Dekujr -ovl_Obj_Elevator -ovl_Obj_Hamishi -ovl_Obj_Hana -ovl_Obj_Hsblock -ovl_Obj_Ice_Poly -ovl_Obj_Kibako -ovl_Obj_Kibako2 -ovl_Obj_Lift -ovl_Obj_Lightswitch -ovl_Obj_Makekinsuta -ovl_Obj_Makeoshihiki -ovl_Obj_Mure -ovl_Obj_Mure2 -ovl_Obj_Mure3 -ovl_Obj_Oshihiki -ovl_Obj_Roomtimer -ovl_Obj_Switch -ovl_Obj_Syokudai -ovl_Obj_Timeblock -ovl_Obj_Tsubo -ovl_Obj_Warp2block -ovl_Object_Kankyo -ovl_Oceff_Spot -ovl_Oceff_Storm -ovl_Oceff_Wipe -ovl_Oceff_Wipe2 -ovl_Oceff_Wipe3 -ovl_Oceff_Wipe4 -ovl_Shot_Sun -gameplay_keep -gameplay_field_keep -gameplay_dangeon_keep -gameplay_object_exchange_static -object_link_boy -object_link_child -object_box -object_human -object_okuta -object_poh -object_wallmaster -object_dy_obj -object_firefly -object_dodongo -object_fire -object_niw -object_tite -object_reeba -object_peehat -object_kingdodongo -object_horse -object_zf -object_goma -object_zl1 -object_gol -object_bubble -object_dodojr -object_torch2 -object_bl -object_tp -object_oA1 -object_st -object_bw -object_ei -object_horse_normal -object_oB1 -object_o_anime -object_spot04_objects -object_ddan_objects -object_hidan_objects -object_horse_ganon -object_oA2 -object_spot00_objects -object_mb -object_bombf -object_sk2 -object_oE1 -object_oE_anime -object_oE2 -object_ydan_objects -object_gnd -object_am -object_dekubaba -object_oA3 -object_oA4 -object_oA5 -object_oA6 -object_oA7 -object_jj -object_oA8 -object_oA9 -object_oB2 -object_oB3 -object_oB4 -object_horse_zelda -object_opening_demo1 -object_warp1 -object_b_heart -object_dekunuts -object_oE3 -object_oE4 -object_menkuri_objects -object_oE5 -object_oE6 -object_oE7 -object_oE8 -object_oE9 -object_oE10 -object_oE11 -object_oE12 -object_vali -object_oA10 -object_oA11 -object_mizu_objects -object_fhg -object_ossan -object_mori_hineri1 -object_Bb -object_toki_objects -object_yukabyun -object_zl2 -object_mjin -object_mjin_flash -object_mjin_dark -object_mjin_flame -object_mjin_ice -object_mjin_soul -object_mjin_wind -object_mjin_oka -object_haka_objects -object_spot06_objects -object_ice_objects -object_relay_objects -object_mori_hineri1a -object_mori_hineri2 -object_mori_hineri2a -object_mori_objects -object_mori_tex -object_spot08_obj -object_warp2 -object_hata -object_bird -object_wood02 -object_lightbox -object_pu_box -object_trap -object_vase -object_im -object_ta -object_tk -object_xc -object_vm -object_bv -object_hakach_objects -object_efc_crystal_light -object_efc_fire_ball -object_efc_flash -object_efc_lgt_shower -object_efc_star_field -object_god_lgt -object_light_ring -object_triforce_spot -object_medal -object_bdan_objects -object_sd -object_rd -object_po_sisters -object_heavy_object -object_gndd -object_fd -object_du -object_fw -object_horse_link_child -object_spot02_objects -object_haka -object_ru1 -object_syokudai -object_fd2 -object_dh -object_rl -object_efc_tw -object_demo_tre_lgt -object_gi_key -object_mir_ray -object_brob -object_gi_jewel -object_spot09_obj -object_spot18_obj -object_bdoor -object_spot17_obj -object_shop_dungen -object_nb -object_mo -object_sb -object_gi_melody -object_gi_heart -object_gi_compass -object_gi_bosskey -object_gi_medal -object_gi_nuts -object_sa -object_gi_hearts -object_gi_arrowcase -object_gi_bombpouch -object_in -object_tr -object_spot16_obj -object_oE1s -object_oE4s -object_os_anime -object_gi_bottle -object_gi_stick -object_gi_map -object_oF1d_map -object_ru2 -object_gi_shield_1 -object_dekujr -object_gi_magicpot -object_gi_bomb_1 -object_oF1s -object_ma2 -object_gi_purse -object_hni -object_tw -object_rr -object_bxa -object_anubice -object_gi_gerudo -object_gi_arrow -object_gi_bomb_2 -object_gi_egg -object_gi_scale -object_gi_shield_2 -object_gi_hookshot -object_gi_ocarina -object_gi_milk -object_ma1 -object_ganon -object_sst -object_ny -object_fr -object_gi_pachinko -object_gi_boomerang -object_gi_bow -object_gi_glasses -object_gi_liquid -object_ani -object_demo_6k -object_gi_shield_3 -object_gi_letter -object_spot15_obj -object_jya_obj -object_gi_clothes -object_gi_bean -object_gi_fish -object_gi_saw -object_gi_hammer -object_gi_grass -object_gi_longsword -object_spot01_objects -object_md -object_km1 -object_kw1 -object_zo -object_kz -object_umajump -object_masterkokiri -object_masterkokirihead -object_mastergolon -object_masterzoora -object_aob -object_ik -object_ahg -object_cne -object_gi_niwatori -object_skj -object_gi_bottle_letter -object_bji -object_bba -object_gi_ocarina_0 -object_ds -object_ane -object_boj -object_spot03_object -object_spot07_object -object_fz -object_bob -object_ge1 -object_yabusame_point -object_gi_boots_2 -object_gi_seed -object_gnd_magic -object_d_elevator -object_d_hsblock -object_d_lift -object_mamenoki -object_goroiwa -object_toryo -object_daiku -object_nwc -object_blkobj -object_gm -object_ms -object_hs -object_ingate -object_lightswitch -object_kusa -object_tsubo -object_gi_gloves -object_gi_coin -object_kanban -object_gjyo_objects -object_owl -object_mk -object_fu -object_gi_ki_tan_mask -object_gi_redead_mask -object_gi_skj_mask -object_gi_rabit_mask -object_gi_truth_mask -object_ganon_objects -object_siofuki -object_stream -object_mm -object_fa -object_os -object_gi_eye_lotion -object_gi_powder -object_gi_mushroom -object_gi_ticketstone -object_gi_brokensword -object_js -object_cs -object_gi_prescription -object_gi_bracelet -object_gi_soldout -object_gi_frog -object_mag -object_door_gerudo -object_gt -object_efc_erupc -object_zl2_anime1 -object_zl2_anime2 -object_gi_golonmask -object_gi_zoramask -object_gi_gerudomask -object_ganon2 -object_ka -object_ts -object_zg -object_gi_hoverboots -object_gi_m_arrow -object_ds2 -object_ec -object_fish -object_gi_sutaru -object_gi_goddess -object_ssh -object_bigokuta -object_bg -object_spot05_objects -object_spot12_obj -object_bombiwa -object_hintnuts -object_rs -object_spot00_break -object_gla -object_shopnuts -object_geldb -object_gr -object_dog -object_jya_iron -object_jya_door -object_spot01_objects2 -object_spot11_obj -object_kibako2 -object_dns -object_dnk -object_gi_fire -object_gi_insect -object_gi_butterfly -object_gi_ghost -object_gi_soul -object_bowl -object_po_field -object_demo_kekkai -object_efc_doughnut -object_gi_dekupouch -object_ganon_anime1 -object_ganon_anime2 -object_ganon_anime3 -object_gi_rupy -object_spot01_matoya -object_spot01_matoyab -object_po_composer -object_mu -object_wf -object_skb -object_gj -object_geff -object_haka_door -object_gs -object_ps -object_bwall -object_crow -object_cow -object_cob -object_gi_sword_1 -object_door_killer -object_ouke_haka -object_timeblock -object_zl4 -g_pn_01 -g_pn_02 -g_pn_03 -g_pn_04 -g_pn_05 -g_pn_06 -g_pn_07 -g_pn_08 -g_pn_09 -g_pn_10 -g_pn_11 -g_pn_12 -g_pn_13 -g_pn_14 -g_pn_15 -g_pn_16 -g_pn_17 -g_pn_18 -g_pn_19 -g_pn_20 -g_pn_21 -g_pn_22 -g_pn_23 -g_pn_24 -g_pn_25 -g_pn_26 -g_pn_27 -g_pn_28 -g_pn_29 -g_pn_30 -g_pn_31 -g_pn_32 -g_pn_33 -g_pn_34 -g_pn_35 -g_pn_36 -g_pn_37 -g_pn_38 -g_pn_39 -g_pn_40 -g_pn_41 -g_pn_42 -g_pn_43 -g_pn_44 -g_pn_45 -g_pn_46 -g_pn_47 -g_pn_48 -g_pn_49 -g_pn_50 -g_pn_51 -g_pn_52 -g_pn_53 -g_pn_54 -g_pn_55 -g_pn_56 -g_pn_57 -z_select_static -nintendo_rogo_static -title_static -parameter_static -vr_fine0_static -vr_fine0_pal_static -vr_fine1_static -vr_fine1_pal_static -vr_fine2_static -vr_fine2_pal_static -vr_fine3_static -vr_fine3_pal_static -vr_cloud0_static -vr_cloud0_pal_static -vr_cloud1_static -vr_cloud1_pal_static -vr_cloud2_static -vr_cloud2_pal_static -vr_cloud3_static -vr_cloud3_pal_static -vr_holy0_static -vr_holy0_pal_static -vr_holy1_static -vr_holy1_pal_static -vr_MDVR_static -vr_MDVR_pal_static -vr_MNVR_static -vr_MNVR_pal_static -vr_RUVR_static -vr_RUVR_pal_static -vr_LHVR_static -vr_LHVR_pal_static -vr_KHVR_static -vr_KHVR_pal_static -vr_K3VR_static -vr_K3VR_pal_static -vr_K4VR_static -vr_K4VR_pal_static -vr_K5VR_static -vr_K5VR_pal_static -vr_SP1a_static -vr_SP1a_pal_static -vr_MLVR_static -vr_MLVR_pal_static -vr_KKRVR_static -vr_KKRVR_pal_static -vr_KR3VR_static -vr_KR3VR_pal_static -vr_IPVR_static -vr_IPVR_pal_static -vr_KSVR_static -vr_KSVR_pal_static -vr_GLVR_static -vr_GLVR_pal_static -vr_ZRVR_static -vr_ZRVR_pal_static -vr_DGVR_static -vr_DGVR_pal_static -vr_ALVR_static -vr_ALVR_pal_static -vr_NSVR_static -vr_NSVR_pal_static -vr_LBVR_static -vr_LBVR_pal_static -vr_TTVR_static -vr_TTVR_pal_static -vr_FCVR_static -vr_FCVR_pal_static -elf_message_field -elf_message_ydan -ydan_scene -ydan_room_0 -ydan_room_1 -ydan_room_2 -ydan_room_3 -ydan_room_4 -ydan_room_5 -ydan_room_6 -ydan_room_7 -ydan_room_8 -ydan_room_9 -ydan_room_10 -ydan_room_11 -ddan_scene -ddan_room_0 -ddan_room_1 -ddan_room_2 -ddan_room_3 -ddan_room_4 -ddan_room_5 -ddan_room_6 -ddan_room_7 -ddan_room_8 -ddan_room_9 -ddan_room_10 -ddan_room_11 -ddan_room_12 -ddan_room_13 -ddan_room_14 -ddan_room_15 -ddan_room_16 -bdan_scene -bdan_room_0 -bdan_room_1 -bdan_room_2 -bdan_room_3 -bdan_room_4 -bdan_room_5 -bdan_room_6 -bdan_room_7 -bdan_room_8 -bdan_room_9 -bdan_room_10 -bdan_room_11 -bdan_room_12 -bdan_room_13 -bdan_room_14 -bdan_room_15 -Bmori1_scene -Bmori1_room_0 -Bmori1_room_1 -Bmori1_room_2 -Bmori1_room_3 -Bmori1_room_4 -Bmori1_room_5 -Bmori1_room_6 -Bmori1_room_7 -Bmori1_room_8 -Bmori1_room_9 -Bmori1_room_10 -Bmori1_room_11 -Bmori1_room_12 -Bmori1_room_13 -Bmori1_room_14 -Bmori1_room_15 -Bmori1_room_16 -Bmori1_room_17 -Bmori1_room_18 -Bmori1_room_19 -Bmori1_room_20 -Bmori1_room_21 -Bmori1_room_22 -HIDAN_scene -HIDAN_room_0 -HIDAN_room_1 -HIDAN_room_2 -HIDAN_room_3 -HIDAN_room_4 -HIDAN_room_5 -HIDAN_room_6 -HIDAN_room_7 -HIDAN_room_8 -HIDAN_room_9 -HIDAN_room_10 -HIDAN_room_11 -HIDAN_room_12 -HIDAN_room_13 -HIDAN_room_14 -HIDAN_room_15 -HIDAN_room_16 -HIDAN_room_17 -HIDAN_room_18 -HIDAN_room_19 -HIDAN_room_20 -HIDAN_room_21 -HIDAN_room_22 -HIDAN_room_23 -HIDAN_room_24 -HIDAN_room_25 -HIDAN_room_26 -MIZUsin_scene -MIZUsin_room_0 -MIZUsin_room_1 -MIZUsin_room_2 -MIZUsin_room_3 -MIZUsin_room_4 -MIZUsin_room_5 -MIZUsin_room_6 -MIZUsin_room_7 -MIZUsin_room_8 -MIZUsin_room_9 -MIZUsin_room_10 -MIZUsin_room_11 -MIZUsin_room_12 -MIZUsin_room_13 -MIZUsin_room_14 -MIZUsin_room_15 -MIZUsin_room_16 -MIZUsin_room_17 -MIZUsin_room_18 -MIZUsin_room_19 -MIZUsin_room_20 -MIZUsin_room_21 -MIZUsin_room_22 -jyasinzou_scene -jyasinzou_room_0 -jyasinzou_room_1 -jyasinzou_room_2 -jyasinzou_room_3 -jyasinzou_room_4 -jyasinzou_room_5 -jyasinzou_room_6 -jyasinzou_room_7 -jyasinzou_room_8 -jyasinzou_room_9 -jyasinzou_room_10 -jyasinzou_room_11 -jyasinzou_room_12 -jyasinzou_room_13 -jyasinzou_room_14 -jyasinzou_room_15 -jyasinzou_room_16 -jyasinzou_room_17 -jyasinzou_room_18 -jyasinzou_room_19 -jyasinzou_room_20 -jyasinzou_room_21 -jyasinzou_room_22 -jyasinzou_room_23 -jyasinzou_room_24 -jyasinzou_room_25 -jyasinzou_room_26 -jyasinzou_room_27 -jyasinzou_room_28 -HAKAdan_scene -HAKAdan_room_0 -HAKAdan_room_1 -HAKAdan_room_2 -HAKAdan_room_3 -HAKAdan_room_4 -HAKAdan_room_5 -HAKAdan_room_6 -HAKAdan_room_7 -HAKAdan_room_8 -HAKAdan_room_9 -HAKAdan_room_10 -HAKAdan_room_11 -HAKAdan_room_12 -HAKAdan_room_13 -HAKAdan_room_14 -HAKAdan_room_15 -HAKAdan_room_16 -HAKAdan_room_17 -HAKAdan_room_18 -HAKAdan_room_19 -HAKAdan_room_20 -HAKAdan_room_21 -HAKAdan_room_22 -HAKAdanCH_scene -HAKAdanCH_room_0 -HAKAdanCH_room_1 -HAKAdanCH_room_2 -HAKAdanCH_room_3 -HAKAdanCH_room_4 -HAKAdanCH_room_5 -HAKAdanCH_room_6 -ice_doukutu_scene -ice_doukutu_room_0 -ice_doukutu_room_1 -ice_doukutu_room_2 -ice_doukutu_room_3 -ice_doukutu_room_4 -ice_doukutu_room_5 -ice_doukutu_room_6 -ice_doukutu_room_7 -ice_doukutu_room_8 -ice_doukutu_room_9 -ice_doukutu_room_10 -ice_doukutu_room_11 -men_scene -men_room_0 -men_room_1 -men_room_2 -men_room_3 -men_room_4 -men_room_5 -men_room_6 -men_room_7 -men_room_8 -men_room_9 -men_room_10 -ganontika_scene -ganontika_room_0 -ganontika_room_1 -ganontika_room_2 -ganontika_room_3 -ganontika_room_4 -ganontika_room_5 -ganontika_room_6 -ganontika_room_7 -ganontika_room_8 -ganontika_room_9 -ganontika_room_10 -ganontika_room_11 -ganontika_room_12 -ganontika_room_13 -ganontika_room_14 -ganontika_room_15 -ganontika_room_16 -ganontika_room_17 -ganontika_room_18 -ganontika_room_19 -spot00_scene -spot00_room_0 -spot01_scene -spot01_room_0 -spot02_scene -spot02_room_0 -spot02_room_1 -spot03_scene -spot03_room_0 -spot03_room_1 -spot04_scene -spot04_room_0 -spot04_room_1 -spot04_room_2 -spot05_scene -spot05_room_0 -spot06_scene -spot06_room_0 -spot07_scene -spot07_room_0 -spot07_room_1 -spot08_scene -spot08_room_0 -spot09_scene -spot09_room_0 -spot10_scene -spot10_room_0 -spot10_room_1 -spot10_room_2 -spot10_room_3 -spot10_room_4 -spot10_room_5 -spot10_room_6 -spot10_room_7 -spot10_room_8 -spot10_room_9 -spot11_scene -spot11_room_0 -spot12_scene -spot12_room_0 -spot12_room_1 -spot13_scene -spot13_room_0 -spot13_room_1 -spot15_scene -spot15_room_0 -spot16_scene -spot16_room_0 -spot17_scene -spot17_room_0 -spot17_room_1 -spot18_scene -spot18_room_0 -spot18_room_1 -spot18_room_2 -spot18_room_3 -market_day_scene -market_day_room_0 -market_night_scene -market_night_room_0 -kenjyanoma_scene -kenjyanoma_room_0 -tokinoma_scene -tokinoma_room_0 -tokinoma_room_1 -link_home_scene -link_home_room_0 -kokiri_shop_scene -kokiri_shop_room_0 -kokiri_home_scene -kokiri_home_room_0 -kakusiana_scene -kakusiana_room_0 -kakusiana_room_1 -kakusiana_room_2 -kakusiana_room_3 -kakusiana_room_4 -kakusiana_room_5 -kakusiana_room_6 -kakusiana_room_7 -kakusiana_room_8 -kakusiana_room_9 -kakusiana_room_10 -kakusiana_room_11 -kakusiana_room_12 -kakusiana_room_13 -entra_scene -entra_room_0 -moribossroom_scene -moribossroom_room_0 -moribossroom_room_1 -syatekijyou_scene -syatekijyou_room_0 -shop1_scene -shop1_room_0 -hairal_niwa_scene -hairal_niwa_room_0 -ganon_tou_scene -ganon_tou_room_0 -market_alley_scene -market_alley_room_0 -spot20_scene -spot20_room_0 -market_ruins_scene -market_ruins_room_0 -entra_n_scene -entra_n_room_0 -enrui_scene -enrui_room_0 -market_alley_n_scene -market_alley_n_room_0 -hiral_demo_scene -hiral_demo_room_0 -kokiri_home3_scene -kokiri_home3_room_0 -malon_stable_scene -malon_stable_room_0 -kakariko_scene -kakariko_room_0 -bdan_boss_scene -bdan_boss_room_0 -bdan_boss_room_1 -FIRE_bs_scene -FIRE_bs_room_0 -FIRE_bs_room_1 -hut_scene -hut_room_0 -daiyousei_izumi_scene -daiyousei_izumi_room_0 -hakaana_scene -hakaana_room_0 -yousei_izumi_tate_scene -yousei_izumi_tate_room_0 -yousei_izumi_yoko_scene -yousei_izumi_yoko_room_0 -golon_scene -golon_room_0 -zoora_scene -zoora_room_0 -drag_scene -drag_room_0 -alley_shop_scene -alley_shop_room_0 -night_shop_scene -night_shop_room_0 -impa_scene -impa_room_0 -labo_scene -labo_room_0 -tent_scene -tent_room_0 -nakaniwa_scene -nakaniwa_room_0 -ddan_boss_scene -ddan_boss_room_0 -ddan_boss_room_1 -ydan_boss_scene -ydan_boss_room_0 -ydan_boss_room_1 -HAKAdan_bs_scene -HAKAdan_bs_room_0 -HAKAdan_bs_room_1 -MIZUsin_bs_scene -MIZUsin_bs_room_0 -MIZUsin_bs_room_1 -ganon_scene -ganon_room_0 -ganon_room_1 -ganon_room_2 -ganon_room_3 -ganon_room_4 -ganon_room_5 -ganon_room_6 -ganon_room_7 -ganon_room_8 -ganon_room_9 -ganon_boss_scene -ganon_boss_room_0 -jyasinboss_scene -jyasinboss_room_0 -jyasinboss_room_1 -jyasinboss_room_2 -jyasinboss_room_3 -kokiri_home4_scene -kokiri_home4_room_0 -kokiri_home5_scene -kokiri_home5_room_0 -ganon_final_scene -ganon_final_room_0 -kakariko3_scene -kakariko3_room_0 -hakasitarelay_scene -hakasitarelay_room_0 -hakasitarelay_room_1 -hakasitarelay_room_2 -hakasitarelay_room_3 -hakasitarelay_room_4 -hakasitarelay_room_5 -hakasitarelay_room_6 -shrine_scene -shrine_room_0 -turibori_scene -turibori_room_0 -shrine_n_scene -shrine_n_room_0 -shrine_r_scene -shrine_r_room_0 -hakaana2_scene -hakaana2_room_0 -gerudoway_scene -gerudoway_room_0 -gerudoway_room_1 -gerudoway_room_2 -gerudoway_room_3 -gerudoway_room_4 -gerudoway_room_5 -hairal_niwa_n_scene -hairal_niwa_n_room_0 -bowling_scene -bowling_room_0 -hakaana_ouke_scene -hakaana_ouke_room_0 -hakaana_ouke_room_1 -hakaana_ouke_room_2 -hylia_labo_scene -hylia_labo_room_0 -souko_scene -souko_room_0 -souko_room_1 -souko_room_2 -miharigoya_scene -miharigoya_room_0 -mahouya_scene -mahouya_room_0 -takaraya_scene -takaraya_room_0 -takaraya_room_1 -takaraya_room_2 -takaraya_room_3 -takaraya_room_4 -takaraya_room_5 -takaraya_room_6 -ganon_sonogo_scene -ganon_sonogo_room_0 -ganon_sonogo_room_1 -ganon_sonogo_room_2 -ganon_sonogo_room_3 -ganon_sonogo_room_4 -ganon_demo_scene -ganon_demo_room_0 -face_shop_scene -face_shop_room_0 -kinsuta_scene -kinsuta_room_0 -ganontikasonogo_scene -ganontikasonogo_room_0 -ganontikasonogo_room_1 -bump_texture_static -anime_model_1_static -anime_model_2_static -anime_model_3_static -anime_model_4_static -anime_model_5_static -anime_model_6_static -anime_texture_1_static -anime_texture_2_static -anime_texture_3_static -anime_texture_4_static -anime_texture_5_static -anime_texture_6_static -softsprite_matrix_static \ No newline at end of file diff --git a/OTRExporter/CFG/filelists/pal_oot.txt b/OTRExporter/CFG/filelists/pal_oot.txt deleted file mode 100644 index 812d3ebdd..000000000 --- a/OTRExporter/CFG/filelists/pal_oot.txt +++ /dev/null @@ -1,1511 +0,0 @@ -makerom -boot -dmadata -Audiobank -Audioseq -Audiotable -link_animetion -icon_item_static -icon_item_24_static -icon_item_field_static -icon_item_dungeon_static -icon_item_gameover_static -icon_item_nes_static -icon_item_ger_static -icon_item_fra_static -item_name_static -map_name_static -do_action_static -message_static -message_texture_static -nes_font_static -nes_message_data_static -ger_message_data_static -fra_message_data_static -staff_message_data_static -map_grand_static -map_i_static -map_48x85_static -code -n64dd -ovl_title -ovl_select -ovl_opening -ovl_file_choose -ovl_kaleido_scope -ovl_player_actor -ovl_map_mark_data -ovl_En_Test -ovl_En_GirlA -ovl_En_Part -ovl_En_Light -ovl_En_Door -ovl_En_Box -ovl_En_Poh -ovl_En_Okuta -ovl_En_Bom -ovl_En_Wallmas -ovl_En_Dodongo -ovl_En_Firefly -ovl_En_Horse -ovl_En_Arrow -ovl_En_Elf -ovl_En_Niw -ovl_En_Tite -ovl_En_Reeba -ovl_En_Peehat -ovl_En_Holl -ovl_En_Scene_Change -ovl_En_Zf -ovl_En_Hata -ovl_Boss_Dodongo -ovl_Boss_Goma -ovl_En_Zl1 -ovl_En_Viewer -ovl_En_Goma -ovl_Bg_Pushbox -ovl_En_Bubble -ovl_Door_Shutter -ovl_En_Dodojr -ovl_En_Bdfire -ovl_En_Boom -ovl_En_Torch2 -ovl_En_Bili -ovl_En_Tp -ovl_En_St -ovl_En_Bw -ovl_En_Eiyer -ovl_En_River_Sound -ovl_En_Horse_Normal -ovl_En_Ossan -ovl_Bg_Treemouth -ovl_Bg_Dodoago -ovl_Bg_Hidan_Dalm -ovl_Bg_Hidan_Hrock -ovl_En_Horse_Ganon -ovl_Bg_Hidan_Rock -ovl_Bg_Hidan_Rsekizou -ovl_Bg_Hidan_Sekizou -ovl_Bg_Hidan_Sima -ovl_Bg_Hidan_Syoku -ovl_En_Xc -ovl_Bg_Hidan_Curtain -ovl_Bg_Spot00_Hanebasi -ovl_En_Mb -ovl_En_Bombf -ovl_Bg_Hidan_Firewall -ovl_Bg_Dy_Yoseizo -ovl_En_Zl2 -ovl_Bg_Hidan_Fslift -ovl_En_OE2 -ovl_Bg_Ydan_Hasi -ovl_Bg_Ydan_Maruta -ovl_Boss_Ganondrof -ovl_En_Am -ovl_En_Dekubaba -ovl_En_M_Fire1 -ovl_En_M_Thunder -ovl_Bg_Ddan_Jd -ovl_Bg_Breakwall -ovl_En_Jj -ovl_En_Horse_Zelda -ovl_Bg_Ddan_Kd -ovl_Door_Warp1 -ovl_Obj_Syokudai -ovl_Item_B_Heart -ovl_En_Dekunuts -ovl_Bg_Menkuri_Kaiten -ovl_Bg_Menkuri_Eye -ovl_En_Vali -ovl_Bg_Mizu_Movebg -ovl_Bg_Mizu_Water -ovl_Arms_Hook -ovl_En_fHG -ovl_Bg_Mori_Hineri -ovl_En_Bb -ovl_Bg_Toki_Hikari -ovl_En_Yukabyun -ovl_Bg_Toki_Swd -ovl_En_Fhg_Fire -ovl_Bg_Mjin -ovl_Bg_Hidan_Kousi -ovl_Door_Toki -ovl_Bg_Hidan_Hamstep -ovl_En_Bird -ovl_En_Wood02 -ovl_En_Lightbox -ovl_En_Pu_box -ovl_En_Trap -ovl_En_Arow_Trap -ovl_En_Vase -ovl_En_Ta -ovl_En_Tk -ovl_Bg_Mori_Bigst -ovl_Bg_Mori_Elevator -ovl_Bg_Mori_Kaitenkabe -ovl_Bg_Mori_Rakkatenjo -ovl_En_Vm -ovl_Demo_Effect -ovl_Demo_Kankyo -ovl_Bg_Hidan_Fwbig -ovl_En_Floormas -ovl_En_Heishi1 -ovl_En_Rd -ovl_En_Po_Sisters -ovl_Bg_Heavy_Block -ovl_Bg_Po_Event -ovl_Obj_Mure -ovl_En_Sw -ovl_Boss_Fd -ovl_Object_Kankyo -ovl_En_Du -ovl_En_Fd -ovl_En_Horse_Link_Child -ovl_Door_Ana -ovl_Bg_Spot02_Objects -ovl_Bg_Haka -ovl_Magic_Wind -ovl_Magic_Fire -ovl_En_Ru1 -ovl_Boss_Fd2 -ovl_En_Fd_Fire -ovl_En_Dh -ovl_En_Dha -ovl_En_Rl -ovl_En_Encount1 -ovl_Demo_Du -ovl_Demo_Im -ovl_Demo_Tre_Lgt -ovl_En_Fw -ovl_Bg_Vb_Sima -ovl_En_Vb_Ball -ovl_Bg_Haka_Megane -ovl_Bg_Haka_MeganeBG -ovl_Bg_Haka_Ship -ovl_Bg_Haka_Sgami -ovl_En_Heishi2 -ovl_En_Encount2 -ovl_En_Fire_Rock -ovl_En_Brob -ovl_Mir_Ray -ovl_Bg_Spot09_Obj -ovl_Bg_Spot18_Obj -ovl_Boss_Va -ovl_Bg_Haka_Tubo -ovl_Bg_Haka_Trap -ovl_Bg_Haka_Huta -ovl_Bg_Haka_Zou -ovl_Bg_Spot17_Funen -ovl_En_Syateki_Itm -ovl_En_Syateki_Man -ovl_En_Tana -ovl_En_Nb -ovl_Boss_Mo -ovl_En_Sb -ovl_En_Bigokuta -ovl_En_Karebaba -ovl_Bg_Bdan_Objects -ovl_Demo_Sa -ovl_Demo_Go -ovl_En_In -ovl_En_Tr -ovl_Bg_Spot16_Bombstone -ovl_Bg_Hidan_Kowarerukabe -ovl_Bg_Bombwall -ovl_En_Ru2 -ovl_Obj_Dekujr -ovl_Bg_Mizu_Uzu -ovl_Bg_Spot06_Objects -ovl_Bg_Ice_Objects -ovl_Bg_Haka_Water -ovl_En_Ma2 -ovl_En_Bom_Chu -ovl_En_Horse_Game_Check -ovl_Boss_Tw -ovl_En_Rr -ovl_En_Ba -ovl_En_Bx -ovl_En_Anubice -ovl_En_Anubice_Fire -ovl_Bg_Mori_Hashigo -ovl_Bg_Mori_Hashira4 -ovl_Bg_Mori_Idomizu -ovl_Bg_Spot16_Doughnut -ovl_Bg_Bdan_Switch -ovl_En_Ma1 -ovl_Boss_Ganon -ovl_Boss_Sst -ovl_En_Ny -ovl_En_Fr -ovl_Item_Shield -ovl_Bg_Ice_Shelter -ovl_En_Ice_Hono -ovl_Item_Ocarina -ovl_Magic_Dark -ovl_Demo_6K -ovl_En_Anubice_Tag -ovl_Bg_Haka_Gate -ovl_Bg_Spot15_Saku -ovl_Bg_Jya_Goroiwa -ovl_Bg_Jya_Zurerukabe -ovl_Bg_Jya_Cobra -ovl_Bg_Jya_Kanaami -ovl_Fishing -ovl_Obj_Oshihiki -ovl_Bg_Gate_Shutter -ovl_Eff_Dust -ovl_Bg_Spot01_Fusya -ovl_Bg_Spot01_Idohashira -ovl_Bg_Spot01_Idomizu -ovl_Bg_Po_Syokudai -ovl_Bg_Ganon_Otyuka -ovl_Bg_Spot15_Rrbox -ovl_Bg_Umajump -ovl_En_Insect -ovl_En_Butte -ovl_En_Fish -ovl_Bg_Spot08_Iceblock -ovl_Item_Etcetera -ovl_Arrow_Fire -ovl_Arrow_Ice -ovl_Arrow_Light -ovl_Obj_Kibako -ovl_Obj_Tsubo -ovl_En_Wonder_Item -ovl_En_Ik -ovl_Demo_Ik -ovl_En_Skj -ovl_En_Skjneedle -ovl_En_G_Switch -ovl_Demo_Ext -ovl_Demo_Shd -ovl_En_Dns -ovl_Elf_Msg -ovl_En_Honotrap -ovl_En_Tubo_Trap -ovl_Obj_Ice_Poly -ovl_Bg_Spot03_Taki -ovl_Bg_Spot07_Taki -ovl_En_Fz -ovl_En_Po_Relay -ovl_Bg_Relay_Objects -ovl_En_Diving_Game -ovl_En_Kusa -ovl_Obj_Bean -ovl_Obj_Bombiwa -ovl_Obj_Switch -ovl_Obj_Elevator -ovl_Obj_Lift -ovl_Obj_Hsblock -ovl_En_Okarina_Tag -ovl_En_Yabusame_Mark -ovl_En_Goroiwa -ovl_En_Ex_Ruppy -ovl_En_Toryo -ovl_En_Daiku -ovl_En_Nwc -ovl_En_Blkobj -ovl_Item_Inbox -ovl_En_Ge1 -ovl_Obj_Blockstop -ovl_En_Sda -ovl_En_Clear_Tag -ovl_En_Niw_Lady -ovl_En_Gm -ovl_En_Ms -ovl_En_Hs -ovl_Bg_Ingate -ovl_En_Kanban -ovl_En_Heishi3 -ovl_En_Syateki_Niw -ovl_En_Attack_Niw -ovl_Bg_Spot01_Idosoko -ovl_En_Sa -ovl_En_Wonder_Talk -ovl_Bg_Gjyo_Bridge -ovl_En_Ds -ovl_En_Mk -ovl_En_Bom_Bowl_Man -ovl_En_Bom_Bowl_Pit -ovl_En_Owl -ovl_En_Ishi -ovl_Obj_Hana -ovl_Obj_Lightswitch -ovl_Obj_Mure2 -ovl_En_Go -ovl_En_Fu -ovl_En_Changer -ovl_Bg_Jya_Megami -ovl_Bg_Jya_Lift -ovl_Bg_Jya_Bigmirror -ovl_Bg_Jya_Bombchuiwa -ovl_Bg_Jya_Amishutter -ovl_Bg_Jya_Bombiwa -ovl_Bg_Spot18_Basket -ovl_En_Ganon_Organ -ovl_En_Siofuki -ovl_En_Stream -ovl_En_Mm -ovl_En_Ko -ovl_En_Kz -ovl_En_Weather_Tag -ovl_Bg_Sst_Floor -ovl_En_Ani -ovl_En_Ex_Item -ovl_Bg_Jya_Ironobj -ovl_En_Js -ovl_En_Jsjutan -ovl_En_Cs -ovl_En_Md -ovl_En_Hy -ovl_En_Ganon_Mant -ovl_En_Okarina_Effect -ovl_En_Mag -ovl_Door_Gerudo -ovl_Elf_Msg2 -ovl_Demo_Gt -ovl_En_Po_Field -ovl_Efc_Erupc -ovl_Bg_Zg -ovl_En_Heishi4 -ovl_En_Zl3 -ovl_Boss_Ganon2 -ovl_En_Kakasi -ovl_En_Takara_Man -ovl_Obj_Makeoshihiki -ovl_Oceff_Spot -ovl_End_Title -ovl_En_Torch -ovl_Demo_Ec -ovl_Shot_Sun -ovl_En_Dy_Extra -ovl_En_Wonder_Talk2 -ovl_En_Ge2 -ovl_Obj_Roomtimer -ovl_En_Ssh -ovl_En_Sth -ovl_Oceff_Wipe -ovl_Effect_Ss_Dust -ovl_Effect_Ss_KiraKira -ovl_Effect_Ss_Bomb -ovl_Effect_Ss_Bomb2 -ovl_Effect_Ss_Blast -ovl_Effect_Ss_G_Spk -ovl_Effect_Ss_D_Fire -ovl_Effect_Ss_Bubble -ovl_Effect_Ss_G_Ripple -ovl_Effect_Ss_G_Splash -ovl_Effect_Ss_G_Magma -ovl_Effect_Ss_G_Fire -ovl_Effect_Ss_Lightning -ovl_Effect_Ss_Dt_Bubble -ovl_Effect_Ss_Hahen -ovl_Effect_Ss_Stick -ovl_Effect_Ss_Sibuki -ovl_Effect_Ss_Sibuki2 -ovl_Effect_Ss_G_Magma2 -ovl_Effect_Ss_Stone1 -ovl_Effect_Ss_HitMark -ovl_Effect_Ss_Fhg_Flash -ovl_Effect_Ss_K_Fire -ovl_Effect_Ss_Solder_Srch_Ball -ovl_Effect_Ss_Kakera -ovl_Effect_Ss_Ice_Piece -ovl_Effect_Ss_En_Ice -ovl_Effect_Ss_Fire_Tail -ovl_Effect_Ss_En_Fire -ovl_Effect_Ss_Extra -ovl_Effect_Ss_Fcircle -ovl_Effect_Ss_Dead_Db -ovl_Effect_Ss_Dead_Dd -ovl_Effect_Ss_Dead_Ds -ovl_Effect_Ss_Dead_Sound -ovl_Oceff_Storm -ovl_En_Weiyer -ovl_Bg_Spot05_Soko -ovl_Bg_Jya_1flift -ovl_Bg_Jya_Haheniron -ovl_Bg_Spot12_Gate -ovl_Bg_Spot12_Saku -ovl_En_Hintnuts -ovl_En_Nutsball -ovl_Bg_Spot00_Break -ovl_En_Shopnuts -ovl_En_It -ovl_En_GeldB -ovl_Oceff_Wipe2 -ovl_Oceff_Wipe3 -ovl_En_Niw_Girl -ovl_En_Dog -ovl_En_Si -ovl_Bg_Spot01_Objects2 -ovl_Obj_Comb -ovl_Bg_Spot11_Bakudankabe -ovl_Obj_Kibako2 -ovl_En_Dnt_Demo -ovl_En_Dnt_Jiji -ovl_En_Dnt_Nomal -ovl_En_Guest -ovl_Bg_Bom_Guard -ovl_En_Hs2 -ovl_Demo_Kekkai -ovl_Bg_Spot08_Bakudankabe -ovl_Bg_Spot17_Bakudankabe -ovl_Obj_Mure3 -ovl_En_Tg -ovl_En_Mu -ovl_En_Go2 -ovl_En_Wf -ovl_En_Skb -ovl_Demo_Gj -ovl_Demo_Geff -ovl_Bg_Gnd_Firemeiro -ovl_Bg_Gnd_Darkmeiro -ovl_Bg_Gnd_Soulmeiro -ovl_Bg_Gnd_Nisekabe -ovl_Bg_Gnd_Iceblock -ovl_Bg_Ydan_Sp -ovl_En_Gb -ovl_En_Gs -ovl_Bg_Mizu_Bwall -ovl_Bg_Mizu_Shutter -ovl_En_Daiku_Kakariko -ovl_Bg_Bowl_Wall -ovl_En_Wall_Tubo -ovl_En_Po_Desert -ovl_En_Crow -ovl_Door_Killer -ovl_Bg_Spot11_Oasis -ovl_Bg_Spot18_Futa -ovl_Bg_Spot18_Shutter -ovl_En_Ma3 -ovl_En_Cow -ovl_Bg_Ice_Turara -ovl_Bg_Ice_Shutter -ovl_En_Kakasi2 -ovl_En_Kakasi3 -ovl_Oceff_Wipe4 -ovl_En_Eg -ovl_Bg_Menkuri_Nisekabe -ovl_En_Zo -ovl_Effect_Ss_Ice_Smoke -ovl_Obj_Makekinsuta -ovl_En_Ge3 -ovl_Obj_Timeblock -ovl_Obj_Hamishi -ovl_En_Zl4 -ovl_En_Mm2 -ovl_Bg_Jya_Block -ovl_Obj_Warp2block -gameplay_keep -gameplay_field_keep -gameplay_dangeon_keep -gameplay_object_exchange_static -object_link_boy -object_link_child -object_box -object_human -object_okuta -object_poh -object_wallmaster -object_dy_obj -object_firefly -object_dodongo -object_fire -object_niw -object_tite -object_reeba -object_peehat -object_kingdodongo -object_horse -object_zf -object_goma -object_zl1 -object_gol -object_bubble -object_dodojr -object_torch2 -object_bl -object_tp -object_oA1 -object_st -object_bw -object_ei -object_horse_normal -object_oB1 -object_o_anime -object_spot04_objects -object_ddan_objects -object_hidan_objects -object_horse_ganon -object_oA2 -object_spot00_objects -object_mb -object_bombf -object_sk2 -object_oE1 -object_oE_anime -object_oE2 -object_ydan_objects -object_gnd -object_am -object_dekubaba -object_oA3 -object_oA4 -object_oA5 -object_oA6 -object_oA7 -object_jj -object_oA8 -object_oA9 -object_oB2 -object_oB3 -object_oB4 -object_horse_zelda -object_opening_demo1 -object_warp1 -object_b_heart -object_dekunuts -object_oE3 -object_oE4 -object_menkuri_objects -object_oE5 -object_oE6 -object_oE7 -object_oE8 -object_oE9 -object_oE10 -object_oE11 -object_oE12 -object_vali -object_oA10 -object_oA11 -object_mizu_objects -object_fhg -object_ossan -object_mori_hineri1 -object_Bb -object_toki_objects -object_yukabyun -object_zl2 -object_mjin -object_mjin_flash -object_mjin_dark -object_mjin_flame -object_mjin_ice -object_mjin_soul -object_mjin_wind -object_mjin_oka -object_haka_objects -object_spot06_objects -object_ice_objects -object_relay_objects -object_mori_hineri1a -object_mori_hineri2 -object_mori_hineri2a -object_mori_objects -object_mori_tex -object_spot08_obj -object_warp2 -object_hata -object_bird -object_wood02 -object_lightbox -object_pu_box -object_trap -object_vase -object_im -object_ta -object_tk -object_xc -object_vm -object_bv -object_hakach_objects -object_efc_crystal_light -object_efc_fire_ball -object_efc_flash -object_efc_lgt_shower -object_efc_star_field -object_god_lgt -object_light_ring -object_triforce_spot -object_medal -object_bdan_objects -object_sd -object_rd -object_po_sisters -object_heavy_object -object_gndd -object_fd -object_du -object_fw -object_horse_link_child -object_spot02_objects -object_haka -object_ru1 -object_syokudai -object_fd2 -object_dh -object_rl -object_efc_tw -object_demo_tre_lgt -object_gi_key -object_mir_ray -object_brob -object_gi_jewel -object_spot09_obj -object_spot18_obj -object_bdoor -object_spot17_obj -object_shop_dungen -object_nb -object_mo -object_sb -object_gi_melody -object_gi_heart -object_gi_compass -object_gi_bosskey -object_gi_medal -object_gi_nuts -object_sa -object_gi_hearts -object_gi_arrowcase -object_gi_bombpouch -object_in -object_tr -object_spot16_obj -object_oE1s -object_oE4s -object_os_anime -object_gi_bottle -object_gi_stick -object_gi_map -object_oF1d_map -object_ru2 -object_gi_shield_1 -object_dekujr -object_gi_magicpot -object_gi_bomb_1 -object_oF1s -object_ma2 -object_gi_purse -object_hni -object_tw -object_rr -object_bxa -object_anubice -object_gi_gerudo -object_gi_arrow -object_gi_bomb_2 -object_gi_egg -object_gi_scale -object_gi_shield_2 -object_gi_hookshot -object_gi_ocarina -object_gi_milk -object_ma1 -object_ganon -object_sst -object_ny -object_fr -object_gi_pachinko -object_gi_boomerang -object_gi_bow -object_gi_glasses -object_gi_liquid -object_ani -object_demo_6k -object_gi_shield_3 -object_gi_letter -object_spot15_obj -object_jya_obj -object_gi_clothes -object_gi_bean -object_gi_fish -object_gi_saw -object_gi_hammer -object_gi_grass -object_gi_longsword -object_spot01_objects -object_md -object_km1 -object_kw1 -object_zo -object_kz -object_umajump -object_masterkokiri -object_masterkokirihead -object_mastergolon -object_masterzoora -object_aob -object_ik -object_ahg -object_cne -object_gi_niwatori -object_skj -object_gi_bottle_letter -object_bji -object_bba -object_gi_ocarina_0 -object_ds -object_ane -object_boj -object_spot03_object -object_spot07_object -object_fz -object_bob -object_ge1 -object_yabusame_point -object_gi_boots_2 -object_gi_seed -object_gnd_magic -object_d_elevator -object_d_hsblock -object_d_lift -object_mamenoki -object_goroiwa -object_toryo -object_daiku -object_nwc -object_blkobj -object_gm -object_ms -object_hs -object_ingate -object_lightswitch -object_kusa -object_tsubo -object_gi_gloves -object_gi_coin -object_kanban -object_gjyo_objects -object_owl -object_mk -object_fu -object_gi_ki_tan_mask -object_gi_redead_mask -object_gi_skj_mask -object_gi_rabit_mask -object_gi_truth_mask -object_ganon_objects -object_siofuki -object_stream -object_mm -object_fa -object_os -object_gi_eye_lotion -object_gi_powder -object_gi_mushroom -object_gi_ticketstone -object_gi_brokensword -object_js -object_cs -object_gi_prescription -object_gi_bracelet -object_gi_soldout -object_gi_frog -object_mag -object_door_gerudo -object_gt -object_efc_erupc -object_zl2_anime1 -object_zl2_anime2 -object_gi_golonmask -object_gi_zoramask -object_gi_gerudomask -object_ganon2 -object_ka -object_ts -object_zg -object_gi_hoverboots -object_gi_m_arrow -object_ds2 -object_ec -object_fish -object_gi_sutaru -object_gi_goddess -object_ssh -object_bigokuta -object_bg -object_spot05_objects -object_spot12_obj -object_bombiwa -object_hintnuts -object_rs -object_spot00_break -object_gla -object_shopnuts -object_geldb -object_gr -object_dog -object_jya_iron -object_jya_door -object_spot01_objects2 -object_spot11_obj -object_kibako2 -object_dns -object_dnk -object_gi_fire -object_gi_insect -object_gi_butterfly -object_gi_ghost -object_gi_soul -object_bowl -object_po_field -object_demo_kekkai -object_efc_doughnut -object_gi_dekupouch -object_ganon_anime1 -object_ganon_anime2 -object_ganon_anime3 -object_gi_rupy -object_spot01_matoya -object_spot01_matoyab -object_po_composer -object_mu -object_wf -object_skb -object_gj -object_geff -object_haka_door -object_gs -object_ps -object_bwall -object_crow -object_cow -object_cob -object_gi_sword_1 -object_door_killer -object_ouke_haka -object_timeblock -object_zl4 -g_pn_01 -g_pn_02 -g_pn_03 -g_pn_04 -g_pn_05 -g_pn_06 -g_pn_07 -g_pn_08 -g_pn_09 -g_pn_10 -g_pn_11 -g_pn_12 -g_pn_13 -g_pn_14 -g_pn_15 -g_pn_16 -g_pn_17 -g_pn_18 -g_pn_19 -g_pn_20 -g_pn_21 -g_pn_22 -g_pn_23 -g_pn_24 -g_pn_25 -g_pn_26 -g_pn_27 -g_pn_28 -g_pn_29 -g_pn_30 -g_pn_31 -g_pn_32 -g_pn_33 -g_pn_34 -g_pn_35 -g_pn_36 -g_pn_37 -g_pn_38 -g_pn_39 -g_pn_40 -g_pn_41 -g_pn_42 -g_pn_43 -g_pn_44 -g_pn_45 -g_pn_46 -g_pn_47 -g_pn_48 -g_pn_49 -g_pn_50 -g_pn_51 -g_pn_52 -g_pn_53 -g_pn_54 -g_pn_55 -g_pn_56 -g_pn_57 -z_select_static -nintendo_rogo_static -title_static -parameter_static -vr_fine0_static -vr_fine0_pal_static -vr_fine1_static -vr_fine1_pal_static -vr_fine2_static -vr_fine2_pal_static -vr_fine3_static -vr_fine3_pal_static -vr_cloud0_static -vr_cloud0_pal_static -vr_cloud1_static -vr_cloud1_pal_static -vr_cloud2_static -vr_cloud2_pal_static -vr_cloud3_static -vr_cloud3_pal_static -vr_holy0_static -vr_holy0_pal_static -vr_holy1_static -vr_holy1_pal_static -vr_MDVR_static -vr_MDVR_pal_static -vr_MNVR_static -vr_MNVR_pal_static -vr_RUVR_static -vr_RUVR_pal_static -vr_LHVR_static -vr_LHVR_pal_static -vr_KHVR_static -vr_KHVR_pal_static -vr_K3VR_static -vr_K3VR_pal_static -vr_K4VR_static -vr_K4VR_pal_static -vr_K5VR_static -vr_K5VR_pal_static -vr_SP1a_static -vr_SP1a_pal_static -vr_MLVR_static -vr_MLVR_pal_static -vr_KKRVR_static -vr_KKRVR_pal_static -vr_KR3VR_static -vr_KR3VR_pal_static -vr_IPVR_static -vr_IPVR_pal_static -vr_KSVR_static -vr_KSVR_pal_static -vr_GLVR_static -vr_GLVR_pal_static -vr_ZRVR_static -vr_ZRVR_pal_static -vr_DGVR_static -vr_DGVR_pal_static -vr_ALVR_static -vr_ALVR_pal_static -vr_NSVR_static -vr_NSVR_pal_static -vr_LBVR_static -vr_LBVR_pal_static -vr_TTVR_static -vr_TTVR_pal_static -vr_FCVR_static -vr_FCVR_pal_static -elf_message_field -elf_message_ydan -ddan_scene -ddan_room_0 -ddan_room_1 -ddan_room_2 -ddan_room_3 -ddan_room_4 -ddan_room_5 -ddan_room_6 -ddan_room_7 -ddan_room_8 -ddan_room_9 -ddan_room_10 -ddan_room_11 -ddan_room_12 -ddan_room_13 -ddan_room_14 -ddan_room_15 -ddan_room_16 -spot00_scene -spot00_room_0 -spot01_scene -spot01_room_0 -spot02_scene -spot02_room_0 -spot02_room_1 -spot03_scene -spot03_room_0 -spot03_room_1 -spot04_scene -spot04_room_0 -spot04_room_1 -spot04_room_2 -spot05_scene -spot05_room_0 -spot06_scene -spot06_room_0 -spot07_scene -spot07_room_0 -spot07_room_1 -spot08_scene -spot08_room_0 -spot09_scene -spot09_room_0 -spot10_scene -spot10_room_0 -spot10_room_1 -spot10_room_2 -spot10_room_3 -spot10_room_4 -spot10_room_5 -spot10_room_6 -spot10_room_7 -spot10_room_8 -spot10_room_9 -spot11_scene -spot11_room_0 -spot12_scene -spot12_room_0 -spot12_room_1 -spot13_scene -spot13_room_0 -spot13_room_1 -spot15_scene -spot15_room_0 -spot16_scene -spot16_room_0 -spot17_scene -spot17_room_0 -spot17_room_1 -spot18_scene -spot18_room_0 -spot18_room_1 -spot18_room_2 -spot18_room_3 -market_day_scene -market_day_room_0 -market_night_scene -market_night_room_0 -HIDAN_scene -HIDAN_room_0 -HIDAN_room_1 -HIDAN_room_2 -HIDAN_room_3 -HIDAN_room_4 -HIDAN_room_5 -HIDAN_room_6 -HIDAN_room_7 -HIDAN_room_8 -HIDAN_room_9 -HIDAN_room_10 -HIDAN_room_11 -HIDAN_room_12 -HIDAN_room_13 -HIDAN_room_14 -HIDAN_room_15 -HIDAN_room_16 -HIDAN_room_17 -HIDAN_room_18 -HIDAN_room_19 -HIDAN_room_20 -HIDAN_room_21 -HIDAN_room_22 -HIDAN_room_23 -HIDAN_room_24 -HIDAN_room_25 -HIDAN_room_26 -Bmori1_scene -Bmori1_room_0 -Bmori1_room_1 -Bmori1_room_2 -Bmori1_room_3 -Bmori1_room_4 -Bmori1_room_5 -Bmori1_room_6 -Bmori1_room_7 -Bmori1_room_8 -Bmori1_room_9 -Bmori1_room_10 -Bmori1_room_11 -Bmori1_room_12 -Bmori1_room_13 -Bmori1_room_14 -Bmori1_room_15 -Bmori1_room_16 -Bmori1_room_17 -Bmori1_room_18 -Bmori1_room_19 -Bmori1_room_20 -Bmori1_room_21 -Bmori1_room_22 -ydan_scene -ydan_room_0 -ydan_room_1 -ydan_room_2 -ydan_room_3 -ydan_room_4 -ydan_room_5 -ydan_room_6 -ydan_room_7 -ydan_room_8 -ydan_room_9 -ydan_room_10 -ydan_room_11 -kenjyanoma_scene -kenjyanoma_room_0 -tokinoma_scene -tokinoma_room_0 -tokinoma_room_1 -link_home_scene -link_home_room_0 -kokiri_shop_scene -kokiri_shop_room_0 -MIZUsin_scene -MIZUsin_room_0 -MIZUsin_room_1 -MIZUsin_room_2 -MIZUsin_room_3 -MIZUsin_room_4 -MIZUsin_room_5 -MIZUsin_room_6 -MIZUsin_room_7 -MIZUsin_room_8 -MIZUsin_room_9 -MIZUsin_room_10 -MIZUsin_room_11 -MIZUsin_room_12 -MIZUsin_room_13 -MIZUsin_room_14 -MIZUsin_room_15 -MIZUsin_room_16 -MIZUsin_room_17 -MIZUsin_room_18 -MIZUsin_room_19 -MIZUsin_room_20 -MIZUsin_room_21 -MIZUsin_room_22 -kokiri_home_scene -kokiri_home_room_0 -kakusiana_scene -kakusiana_room_0 -kakusiana_room_1 -kakusiana_room_2 -kakusiana_room_3 -kakusiana_room_4 -kakusiana_room_5 -kakusiana_room_6 -kakusiana_room_7 -kakusiana_room_8 -kakusiana_room_9 -kakusiana_room_10 -kakusiana_room_11 -kakusiana_room_12 -kakusiana_room_13 -entra_scene -entra_room_0 -bdan_scene -bdan_room_0 -bdan_room_1 -bdan_room_2 -bdan_room_3 -bdan_room_4 -bdan_room_5 -bdan_room_6 -bdan_room_7 -bdan_room_8 -bdan_room_9 -bdan_room_10 -bdan_room_11 -bdan_room_12 -bdan_room_13 -bdan_room_14 -bdan_room_15 -HAKAdan_scene -HAKAdan_room_0 -HAKAdan_room_1 -HAKAdan_room_2 -HAKAdan_room_3 -HAKAdan_room_4 -HAKAdan_room_5 -HAKAdan_room_6 -HAKAdan_room_7 -HAKAdan_room_8 -HAKAdan_room_9 -HAKAdan_room_10 -HAKAdan_room_11 -HAKAdan_room_12 -HAKAdan_room_13 -HAKAdan_room_14 -HAKAdan_room_15 -HAKAdan_room_16 -HAKAdan_room_17 -HAKAdan_room_18 -HAKAdan_room_19 -HAKAdan_room_20 -HAKAdan_room_21 -HAKAdan_room_22 -moribossroom_scene -moribossroom_room_0 -moribossroom_room_1 -syatekijyou_scene -syatekijyou_room_0 -men_scene -men_room_0 -men_room_1 -men_room_2 -men_room_3 -men_room_4 -men_room_5 -men_room_6 -men_room_7 -men_room_8 -men_room_9 -men_room_10 -shop1_scene -shop1_room_0 -hairal_niwa_scene -hairal_niwa_room_0 -ganon_tou_scene -ganon_tou_room_0 -market_alley_scene -market_alley_room_0 -spot20_scene -spot20_room_0 -market_ruins_scene -market_ruins_room_0 -entra_n_scene -entra_n_room_0 -enrui_scene -enrui_room_0 -market_alley_n_scene -market_alley_n_room_0 -hiral_demo_scene -hiral_demo_room_0 -kokiri_home3_scene -kokiri_home3_room_0 -jyasinzou_scene -jyasinzou_room_0 -jyasinzou_room_1 -jyasinzou_room_2 -jyasinzou_room_3 -jyasinzou_room_4 -jyasinzou_room_5 -jyasinzou_room_6 -jyasinzou_room_7 -jyasinzou_room_8 -jyasinzou_room_9 -jyasinzou_room_10 -jyasinzou_room_11 -jyasinzou_room_12 -jyasinzou_room_13 -jyasinzou_room_14 -jyasinzou_room_15 -jyasinzou_room_16 -jyasinzou_room_17 -jyasinzou_room_18 -jyasinzou_room_19 -jyasinzou_room_20 -jyasinzou_room_21 -jyasinzou_room_22 -jyasinzou_room_23 -jyasinzou_room_24 -jyasinzou_room_25 -jyasinzou_room_26 -jyasinzou_room_27 -jyasinzou_room_28 -ice_doukutu_scene -ice_doukutu_room_0 -ice_doukutu_room_1 -ice_doukutu_room_2 -ice_doukutu_room_3 -ice_doukutu_room_4 -ice_doukutu_room_5 -ice_doukutu_room_6 -ice_doukutu_room_7 -ice_doukutu_room_8 -ice_doukutu_room_9 -ice_doukutu_room_10 -ice_doukutu_room_11 -malon_stable_scene -malon_stable_room_0 -kakariko_scene -kakariko_room_0 -bdan_boss_scene -bdan_boss_room_0 -bdan_boss_room_1 -FIRE_bs_scene -FIRE_bs_room_0 -FIRE_bs_room_1 -hut_scene -hut_room_0 -daiyousei_izumi_scene -daiyousei_izumi_room_0 -hakaana_scene -hakaana_room_0 -yousei_izumi_tate_scene -yousei_izumi_tate_room_0 -yousei_izumi_yoko_scene -yousei_izumi_yoko_room_0 -golon_scene -golon_room_0 -zoora_scene -zoora_room_0 -drag_scene -drag_room_0 -alley_shop_scene -alley_shop_room_0 -night_shop_scene -night_shop_room_0 -impa_scene -impa_room_0 -labo_scene -labo_room_0 -tent_scene -tent_room_0 -nakaniwa_scene -nakaniwa_room_0 -ddan_boss_scene -ddan_boss_room_0 -ddan_boss_room_1 -ydan_boss_scene -ydan_boss_room_0 -ydan_boss_room_1 -HAKAdan_bs_scene -HAKAdan_bs_room_0 -HAKAdan_bs_room_1 -MIZUsin_bs_scene -MIZUsin_bs_room_0 -MIZUsin_bs_room_1 -ganon_scene -ganon_room_0 -ganon_room_1 -ganon_room_2 -ganon_room_3 -ganon_room_4 -ganon_room_5 -ganon_room_6 -ganon_room_7 -ganon_room_8 -ganon_room_9 -ganon_boss_scene -ganon_boss_room_0 -jyasinboss_scene -jyasinboss_room_0 -jyasinboss_room_1 -jyasinboss_room_2 -jyasinboss_room_3 -kokiri_home4_scene -kokiri_home4_room_0 -kokiri_home5_scene -kokiri_home5_room_0 -ganon_final_scene -ganon_final_room_0 -kakariko3_scene -kakariko3_room_0 -hakasitarelay_scene -hakasitarelay_room_0 -hakasitarelay_room_1 -hakasitarelay_room_2 -hakasitarelay_room_3 -hakasitarelay_room_4 -hakasitarelay_room_5 -hakasitarelay_room_6 -shrine_scene -shrine_room_0 -turibori_scene -turibori_room_0 -shrine_n_scene -shrine_n_room_0 -shrine_r_scene -shrine_r_room_0 -ganontika_scene -ganontika_room_0 -ganontika_room_1 -ganontika_room_2 -ganontika_room_3 -ganontika_room_4 -ganontika_room_5 -ganontika_room_6 -ganontika_room_7 -ganontika_room_8 -ganontika_room_9 -ganontika_room_10 -ganontika_room_11 -ganontika_room_12 -ganontika_room_13 -ganontika_room_14 -ganontika_room_15 -ganontika_room_16 -ganontika_room_17 -ganontika_room_18 -ganontika_room_19 -hakaana2_scene -hakaana2_room_0 -gerudoway_scene -gerudoway_room_0 -gerudoway_room_1 -gerudoway_room_2 -gerudoway_room_3 -gerudoway_room_4 -gerudoway_room_5 -HAKAdanCH_scene -HAKAdanCH_room_0 -HAKAdanCH_room_1 -HAKAdanCH_room_2 -HAKAdanCH_room_3 -HAKAdanCH_room_4 -HAKAdanCH_room_5 -HAKAdanCH_room_6 -hairal_niwa_n_scene -hairal_niwa_n_room_0 -bowling_scene -bowling_room_0 -hakaana_ouke_scene -hakaana_ouke_room_0 -hakaana_ouke_room_1 -hakaana_ouke_room_2 -hylia_labo_scene -hylia_labo_room_0 -souko_scene -souko_room_0 -souko_room_1 -souko_room_2 -miharigoya_scene -miharigoya_room_0 -mahouya_scene -mahouya_room_0 -takaraya_scene -takaraya_room_0 -takaraya_room_1 -takaraya_room_2 -takaraya_room_3 -takaraya_room_4 -takaraya_room_5 -takaraya_room_6 -ganon_sonogo_scene -ganon_sonogo_room_0 -ganon_sonogo_room_1 -ganon_sonogo_room_2 -ganon_sonogo_room_3 -ganon_sonogo_room_4 -ganon_demo_scene -ganon_demo_room_0 -face_shop_scene -face_shop_room_0 -kinsuta_scene -kinsuta_room_0 -ganontikasonogo_scene -ganontikasonogo_room_0 -ganontikasonogo_room_1 -bump_texture_static -anime_model_1_static -anime_model_2_static -anime_model_3_static -anime_model_4_static -anime_model_5_static -anime_model_6_static -anime_texture_1_static -anime_texture_2_static -anime_texture_3_static -anime_texture_4_static -anime_texture_5_static -anime_texture_6_static -softsprite_matrix_static \ No newline at end of file diff --git a/OTRExporter/CMake/Default.cmake b/OTRExporter/CMake/Default.cmake deleted file mode 100644 index f4d0ba084..000000000 --- a/OTRExporter/CMake/Default.cmake +++ /dev/null @@ -1,65 +0,0 @@ -################################################################################ -# Command for variable_watch. This command issues error message, if a variable -# is changed. If variable PROPERTY_READER_GUARD_DISABLED is TRUE nothing happens -# variable_watch( property_reader_guard) -################################################################################ -function(property_reader_guard VARIABLE ACCESS VALUE CURRENT_LIST_FILE STACK) - if("${PROPERTY_READER_GUARD_DISABLED}") - return() - endif() - - if("${ACCESS}" STREQUAL "MODIFIED_ACCESS") - message(FATAL_ERROR - " Variable ${VARIABLE} is not supposed to be changed.\n" - " It is used only for reading target property ${VARIABLE}.\n" - " Use\n" - " set_target_properties(\"\" PROPERTIES \"${VARIABLE}\" \"\")\n" - " or\n" - " set_target_properties(\"\" PROPERTIES \"${VARIABLE}_\" \"\")\n" - " instead.\n") - endif() -endfunction() - -################################################################################ -# Create variable with generator expression that expands to value of -# target property _. If property is empty or not set then property -# is used instead. Variable has watcher property_reader_guard that -# doesn't allow to edit it. -# create_property_reader() -# Input: -# name - Name of watched property and output variable -################################################################################ -function(create_property_reader NAME) - set(PROPERTY_READER_GUARD_DISABLED TRUE) - set(CONFIG_VALUE "$>>>") - set(IS_CONFIG_VALUE_EMPTY "$") - set(GENERAL_VALUE "$>") - set("${NAME}" "$" PARENT_SCOPE) - variable_watch("${NAME}" property_reader_guard) -endfunction() - -################################################################################ -# Set property $_${PROPS_CONFIG_U} of ${PROPS_TARGET} to -# set_config_specific_property( ) -# Input: -# name - Prefix of property name -# value - New value -################################################################################ -function(set_config_specific_property NAME VALUE) - set_target_properties("${PROPS_TARGET}" PROPERTIES "${NAME}_${PROPS_CONFIG_U}" "${VALUE}") -endfunction() - -################################################################################ - -create_property_reader("TARGET_NAME") -create_property_reader("OUTPUT_DIRECTORY") - -set_config_specific_property("TARGET_NAME" "${PROPS_TARGET}") -set_config_specific_property("OUTPUT_NAME" "${TARGET_NAME}") -set_config_specific_property("ARCHIVE_OUTPUT_NAME" "${TARGET_NAME}") -set_config_specific_property("LIBRARY_OUTPUT_NAME" "${TARGET_NAME}") -set_config_specific_property("RUNTIME_OUTPUT_NAME" "${TARGET_NAME}") - -set_config_specific_property("ARCHIVE_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}") -set_config_specific_property("LIBRARY_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}") -set_config_specific_property("RUNTIME_OUTPUT_DIRECTORY" "${OUTPUT_DIRECTORY}") \ No newline at end of file diff --git a/OTRExporter/CMake/DefaultCXX.cmake b/OTRExporter/CMake/DefaultCXX.cmake deleted file mode 100644 index e06b3cd2f..000000000 --- a/OTRExporter/CMake/DefaultCXX.cmake +++ /dev/null @@ -1,12 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/Default.cmake") - -set_config_specific_property("OUTPUT_DIRECTORY" "${CMAKE_SOURCE_DIR}$<$>:/${CMAKE_VS_PLATFORM_NAME}>/${PROPS_CONFIG}") - -if(MSVC) - create_property_reader("DEFAULT_CXX_EXCEPTION_HANDLING") - create_property_reader("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT") - - set_target_properties("${PROPS_TARGET}" PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") - set_config_specific_property("DEFAULT_CXX_EXCEPTION_HANDLING" "/EHsc") - set_config_specific_property("DEFAULT_CXX_DEBUG_INFORMATION_FORMAT" "/Zi") -endif() diff --git a/OTRExporter/CMake/Utils.cmake b/OTRExporter/CMake/Utils.cmake deleted file mode 100644 index d9822f0a3..000000000 --- a/OTRExporter/CMake/Utils.cmake +++ /dev/null @@ -1,233 +0,0 @@ -# utils file for projects came from visual studio solution with cmake-converter. - -################################################################################ -# Wrap each token of the command with condition -################################################################################ -cmake_policy(PUSH) -cmake_policy(SET CMP0054 NEW) -macro(prepare_commands) - unset(TOKEN_ROLE) - unset(COMMANDS) - foreach(TOKEN ${ARG_COMMANDS}) - if("${TOKEN}" STREQUAL "COMMAND") - set(TOKEN_ROLE "KEYWORD") - elseif("${TOKEN_ROLE}" STREQUAL "KEYWORD") - set(TOKEN_ROLE "CONDITION") - elseif("${TOKEN_ROLE}" STREQUAL "CONDITION") - set(TOKEN_ROLE "COMMAND") - elseif("${TOKEN_ROLE}" STREQUAL "COMMAND") - set(TOKEN_ROLE "ARG") - endif() - - if("${TOKEN_ROLE}" STREQUAL "KEYWORD") - list(APPEND COMMANDS "${TOKEN}") - elseif("${TOKEN_ROLE}" STREQUAL "CONDITION") - set(CONDITION ${TOKEN}) - elseif("${TOKEN_ROLE}" STREQUAL "COMMAND") - list(APPEND COMMANDS "$<$:${DUMMY}>$<${CONDITION}:${TOKEN}>") - elseif("${TOKEN_ROLE}" STREQUAL "ARG") - list(APPEND COMMANDS "$<${CONDITION}:${TOKEN}>") - endif() - endforeach() -endmacro() -cmake_policy(POP) - -################################################################################ -# Transform all the tokens to absolute paths -################################################################################ -macro(prepare_output) - unset(OUTPUT) - foreach(TOKEN ${ARG_OUTPUT}) - if(IS_ABSOLUTE ${TOKEN}) - list(APPEND OUTPUT "${TOKEN}") - else() - list(APPEND OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/${TOKEN}") - endif() - endforeach() -endmacro() - -################################################################################ -# Parse add_custom_command_if args. -# -# Input: -# PRE_BUILD - Pre build event option -# PRE_LINK - Pre link event option -# POST_BUILD - Post build event option -# TARGET - Target -# OUTPUT - List of output files -# DEPENDS - List of files on which the command depends -# COMMANDS - List of commands(COMMAND condition1 commannd1 args1 COMMAND -# condition2 commannd2 args2 ...) -# Output: -# OUTPUT - Output files -# DEPENDS - Files on which the command depends -# COMMENT - Comment -# PRE_BUILD - TRUE/FALSE -# PRE_LINK - TRUE/FALSE -# POST_BUILD - TRUE/FALSE -# TARGET - Target name -# COMMANDS - Prepared commands(every token is wrapped in CONDITION) -# NAME - Unique name for custom target -# STEP - PRE_BUILD/PRE_LINK/POST_BUILD -################################################################################ -function(add_custom_command_if_parse_arguments) - cmake_parse_arguments("ARG" "PRE_BUILD;PRE_LINK;POST_BUILD" "TARGET;COMMENT" "DEPENDS;OUTPUT;COMMANDS" ${ARGN}) - - if(WIN32) - set(DUMMY "cd.") - elseif(UNIX) - set(DUMMY "true") - endif() - - prepare_commands() - prepare_output() - - set(DEPENDS "${ARG_DEPENDS}") - set(COMMENT "${ARG_COMMENT}") - set(PRE_BUILD "${ARG_PRE_BUILD}") - set(PRE_LINK "${ARG_PRE_LINK}") - set(POST_BUILD "${ARG_POST_BUILD}") - set(TARGET "${ARG_TARGET}") - if(PRE_BUILD) - set(STEP "PRE_BUILD") - elseif(PRE_LINK) - set(STEP "PRE_LINK") - elseif(POST_BUILD) - set(STEP "POST_BUILD") - endif() - set(NAME "${TARGET}_${STEP}") - - set(OUTPUT "${OUTPUT}" PARENT_SCOPE) - set(DEPENDS "${DEPENDS}" PARENT_SCOPE) - set(COMMENT "${COMMENT}" PARENT_SCOPE) - set(PRE_BUILD "${PRE_BUILD}" PARENT_SCOPE) - set(PRE_LINK "${PRE_LINK}" PARENT_SCOPE) - set(POST_BUILD "${POST_BUILD}" PARENT_SCOPE) - set(TARGET "${TARGET}" PARENT_SCOPE) - set(COMMANDS "${COMMANDS}" PARENT_SCOPE) - set(STEP "${STEP}" PARENT_SCOPE) - set(NAME "${NAME}" PARENT_SCOPE) -endfunction() - -################################################################################ -# Add conditional custom command -# -# Generating Files -# The first signature is for adding a custom command to produce an output: -# add_custom_command_if( -# -# -# -# [COMMAND condition command2 [args2...]] -# [DEPENDS [depends...]] -# [COMMENT comment] -# -# Build Events -# add_custom_command_if( -# -# -# -# [COMMAND condition command2 [args2...]] -# [COMMENT comment] -# -# Input: -# output - Output files the command is expected to produce -# condition - Generator expression for wrapping the command -# command - Command-line(s) to execute at build time. -# args - Command`s args -# depends - Files on which the command depends -# comment - Display the given message before the commands are executed at -# build time. -# PRE_BUILD - Run before any other rules are executed within the target -# PRE_LINK - Run after sources have been compiled but before linking the -# binary -# POST_BUILD - Run after all other rules within the target have been -# executed -################################################################################ -function(add_custom_command_if) - add_custom_command_if_parse_arguments(${ARGN}) - - if(OUTPUT AND TARGET) - message(FATAL_ERROR "Wrong syntax. A TARGET and OUTPUT can not both be specified.") - endif() - - if(OUTPUT) - add_custom_command(OUTPUT ${OUTPUT} - ${COMMANDS} - DEPENDS ${DEPENDS} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT ${COMMENT}) - elseif(TARGET) - if(PRE_BUILD AND NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio") - add_custom_target( - ${NAME} - ${COMMANDS} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT ${COMMENT}) - add_dependencies(${TARGET} ${NAME}) - else() - add_custom_command( - TARGET ${TARGET} - ${STEP} - ${COMMANDS} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT ${COMMENT}) - endif() - else() - message(FATAL_ERROR "Wrong syntax. A TARGET or OUTPUT must be specified.") - endif() -endfunction() - -################################################################################ -# Use props file for a target and configs -# use_props( ) -# Inside there are following variables: -# PROPS_TARGET - -# PROPS_CONFIG - One of -# PROPS_CONFIG_U - Uppercase PROPS_CONFIG -# Input: -# target - Target to apply props file -# configs - Build configurations to apply props file -# props_file - CMake script -################################################################################ -macro(use_props TARGET CONFIGS PROPS_FILE) - set(PROPS_TARGET "${TARGET}") - foreach(PROPS_CONFIG ${CONFIGS}) - string(TOUPPER "${PROPS_CONFIG}" PROPS_CONFIG_U) - - get_filename_component(ABSOLUTE_PROPS_FILE "${PROPS_FILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_LIST_DIR}") - if(EXISTS "${ABSOLUTE_PROPS_FILE}") - include("${ABSOLUTE_PROPS_FILE}") - else() - message(WARNING "Corresponding cmake file from props \"${ABSOLUTE_PROPS_FILE}\" doesn't exist") - endif() - endforeach() -endmacro() - -################################################################################ -# Add compile options to source file -# source_file_compile_options( [compile_options...]) -# Input: -# source_file - Source file -# compile_options - Options to add to COMPILE_FLAGS property -################################################################################ -function(source_file_compile_options SOURCE_FILE) - if("${ARGC}" LESS_EQUAL "1") - return() - endif() - - get_source_file_property(COMPILE_OPTIONS "${SOURCE_FILE}" COMPILE_OPTIONS) - - if(COMPILE_OPTIONS) - list(APPEND COMPILE_OPTIONS ${ARGN}) - else() - set(COMPILE_OPTIONS "${ARGN}") - endif() - - set_source_files_properties("${SOURCE_FILE}" PROPERTIES COMPILE_OPTIONS "${COMPILE_OPTIONS}") -endfunction() - -################################################################################ -# Default properties of visual studio projects -################################################################################ -set(DEFAULT_CXX_PROPS "${CMAKE_CURRENT_LIST_DIR}/DefaultCXX.cmake") diff --git a/OTRExporter/CMakeLists.txt b/OTRExporter/CMakeLists.txt deleted file mode 100644 index e759cd128..000000000 --- a/OTRExporter/CMakeLists.txt +++ /dev/null @@ -1,96 +0,0 @@ -cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR) - -set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE) -set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use") -#set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use") -set(CMAKE_C_STANDARD 11) - -project(OTRExporter C CXX) - -################################################################################ -# Set target arch type if empty. Visual studio solution generator provides it. -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if(NOT CMAKE_VS_PLATFORM_NAME) - set(CMAKE_VS_PLATFORM_NAME "x64") - endif() - message("${CMAKE_VS_PLATFORM_NAME} architecture in use") - - if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64" - OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")) - message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!") - endif() -endif() - -################################################################################ -# Global configuration types -################################################################################ -set(CMAKE_CONFIGURATION_TYPES - "Debug" - "Release" - CACHE STRING "" FORCE -) - -################################################################################ -# Global compiler options -################################################################################ -if(MSVC) - # remove default flags provided with CMake for MSVC - set(CMAKE_C_FLAGS "") - set(CMAKE_C_FLAGS_DEBUG "") - set(CMAKE_C_FLAGS_RELEASE "") - set(CMAKE_CXX_FLAGS "") - set(CMAKE_CXX_FLAGS_DEBUG "") - set(CMAKE_CXX_FLAGS_RELEASE "") -endif() - -################################################################################ -# Global linker options -################################################################################ -if(MSVC) - # remove default flags provided with CMake for MSVC - set(CMAKE_EXE_LINKER_FLAGS "") - set(CMAKE_MODULE_LINKER_FLAGS "") - set(CMAKE_SHARED_LINKER_FLAGS "") - set(CMAKE_STATIC_LINKER_FLAGS "") - set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS}") - set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS}") - set(CMAKE_STATIC_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS}") - set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS}") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS}") - set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS}") -endif() - -################################################################################ -# Common utils -################################################################################ -include(CMake/Utils.cmake) - -################################################################################ -# Additional Global Settings(add specific info there) -################################################################################ -include(CMake/GlobalSettingsInclude.cmake OPTIONAL) - -################################################################################ -# Use solution folders feature -################################################################################ -set_property(GLOBAL PROPERTY USE_FOLDERS ON) - -################################################################################ -# Sub-projects -################################################################################ -if (NOT TARGET libultraship) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libultraship ${CMAKE_BINARY_DIR}/libultraship) -endif() - -if (NOT TARGET ZAPD) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD ${CMAKE_BINARY_DIR}/ZAPD) -endif() - -if (NOT TARGET ZAPDUtils) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern/ZAPDUtils ${CMAKE_BINARY_DIR}/ZAPDUtils) -endif() - -add_subdirectory(OTRExporter) diff --git a/OTRExporter/LICENSE b/OTRExporter/LICENSE deleted file mode 100644 index 59ddd97bc..000000000 --- a/OTRExporter/LICENSE +++ /dev/null @@ -1,9 +0,0 @@ -Copyright (c) 2022 Harbour Masters - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/OTRExporter/OTRExporter/AnimationExporter.cpp b/OTRExporter/OTRExporter/AnimationExporter.cpp deleted file mode 100644 index 416d74725..000000000 --- a/OTRExporter/OTRExporter/AnimationExporter.cpp +++ /dev/null @@ -1,70 +0,0 @@ -#include "AnimationExporter.h" -#include - -void OTRExporter_Animation::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZAnimation* anim = (ZAnimation*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Animation); - - ZNormalAnimation* normalAnim = dynamic_cast(anim); - ZCurveAnimation* curveAnim = dynamic_cast(anim); - ZLinkAnimation* linkAnim = dynamic_cast(anim); - if (linkAnim != nullptr) - { - writer->Write((uint32_t)LUS::AnimationType::Link); - writer->Write((uint16_t)linkAnim->frameCount); - writer->Write((uint32_t)linkAnim->segmentAddress); - } - else if (curveAnim != nullptr) - { - writer->Write((uint32_t)LUS::AnimationType::Curve); - writer->Write((uint16_t)curveAnim->frameCount); - - writer->Write((uint32_t)curveAnim->refIndexArr.size()); - - for (auto val : curveAnim->refIndexArr) - writer->Write(val); - - writer->Write((uint32_t)curveAnim->transformDataArr.size()); - - for (auto val : curveAnim->transformDataArr) - { - writer->Write(val.unk_00); - writer->Write(val.unk_02); - writer->Write(val.unk_04); - writer->Write(val.unk_06); - writer->Write(val.unk_08); - } - - writer->Write((uint32_t)curveAnim->copyValuesArr.size()); - - for (auto val : curveAnim->copyValuesArr) - writer->Write(val); - } - else if (normalAnim != nullptr) - { - writer->Write((uint32_t)LUS::AnimationType::Normal); - writer->Write((uint16_t)normalAnim->frameCount); - - writer->Write((uint32_t)normalAnim->rotationValues.size()); - - for (size_t i = 0; i < normalAnim->rotationValues.size(); i++) - writer->Write(normalAnim->rotationValues[i]); - - writer->Write((uint32_t)normalAnim->rotationIndices.size()); - - for (size_t i = 0; i < normalAnim->rotationIndices.size(); i++) - { - writer->Write(normalAnim->rotationIndices[i].x); - writer->Write(normalAnim->rotationIndices[i].y); - writer->Write(normalAnim->rotationIndices[i].z); - } - - writer->Write(normalAnim->limit); - } - else - { - writer->Write((uint32_t)LUS::AnimationType::Legacy); - } -} diff --git a/OTRExporter/OTRExporter/AnimationExporter.h b/OTRExporter/OTRExporter/AnimationExporter.h deleted file mode 100644 index 58fddb2fd..000000000 --- a/OTRExporter/OTRExporter/AnimationExporter.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "ZAnimation.h" -#include "Exporter.h" -#include - -class OTRExporter_Animation : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/ArrayExporter.cpp b/OTRExporter/OTRExporter/ArrayExporter.cpp deleted file mode 100644 index f6b602bbb..000000000 --- a/OTRExporter/OTRExporter/ArrayExporter.cpp +++ /dev/null @@ -1,108 +0,0 @@ -#include "ArrayExporter.h" -#include "VtxExporter.h" -#include -void OTRExporter_Array::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZArray* arr = (ZArray*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::Array); - - writer->Write((uint32_t)arr->resList[0]->GetResourceType()); - writer->Write((uint32_t)arr->arrayCnt); - - for (size_t i = 0; i < arr->arrayCnt; i++) - { - if (arr->resList[i]->GetResourceType() == ZResourceType::Vertex) - { - ZVtx* vtx = (ZVtx*)arr->resList[i]; - writer->Write(vtx->x); - writer->Write(vtx->y); - writer->Write(vtx->z); - writer->Write(vtx->flag); - writer->Write(vtx->s); - writer->Write(vtx->t); - writer->Write(vtx->r); - writer->Write(vtx->g); - writer->Write(vtx->b); - writer->Write(vtx->a); - } - else if (arr->resList[i]->GetResourceType() == ZResourceType::Vector) - { - ZVector* vec = (ZVector*)arr->resList[i]; - writer->Write((uint32_t)vec->scalarType); - writer->Write((uint32_t)vec->dimensions); - - for (size_t k = 0; k < vec->dimensions; k++) - { - // OTRTODO: Duplicate code here. Cleanup at a later date... - switch (vec->scalarType) - { - case ZScalarType::ZSCALAR_U8: - writer->Write(vec->scalars[k].scalarData.u8); - break; - case ZScalarType::ZSCALAR_S8: - writer->Write(vec->scalars[k].scalarData.s8); - break; - case ZScalarType::ZSCALAR_U16: - writer->Write(vec->scalars[k].scalarData.u16); - break; - case ZScalarType::ZSCALAR_S16: - writer->Write(vec->scalars[k].scalarData.s16); - break; - case ZScalarType::ZSCALAR_S32: - writer->Write(vec->scalars[k].scalarData.s32); - break; - case ZScalarType::ZSCALAR_U32: - writer->Write(vec->scalars[k].scalarData.u32); - break; - case ZScalarType::ZSCALAR_S64: - writer->Write(vec->scalars[k].scalarData.s64); - break; - case ZScalarType::ZSCALAR_U64: - writer->Write(vec->scalars[k].scalarData.u64); - break; - // OTRTODO: ADD OTHER TYPES - default: - break; - } - } - } - else - { - ZScalar* scal = (ZScalar*)arr->resList[i]; - - writer->Write((uint32_t)scal->scalarType); - - switch (scal->scalarType) - { - case ZScalarType::ZSCALAR_U8: - writer->Write(scal->scalarData.u8); - break; - case ZScalarType::ZSCALAR_S8: - writer->Write(scal->scalarData.s8); - break; - case ZScalarType::ZSCALAR_U16: - writer->Write(scal->scalarData.u16); - break; - case ZScalarType::ZSCALAR_S16: - writer->Write(scal->scalarData.s16); - break; - case ZScalarType::ZSCALAR_S32: - writer->Write(scal->scalarData.s32); - break; - case ZScalarType::ZSCALAR_U32: - writer->Write(scal->scalarData.u32); - break; - case ZScalarType::ZSCALAR_S64: - writer->Write(scal->scalarData.s64); - break; - case ZScalarType::ZSCALAR_U64: - writer->Write(scal->scalarData.u64); - break; - // OTRTODO: ADD OTHER TYPES - default: - break; - } - } - } -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/ArrayExporter.h b/OTRExporter/OTRExporter/ArrayExporter.h deleted file mode 100644 index 1d2dc0f2b..000000000 --- a/OTRExporter/OTRExporter/ArrayExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include "ZResource.h" -#include "ZArray.h" -#include "Exporter.h" -#include - -class OTRExporter_Array : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; - -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/AudioExporter.cpp b/OTRExporter/OTRExporter/AudioExporter.cpp deleted file mode 100644 index 6e1f38e79..000000000 --- a/OTRExporter/OTRExporter/AudioExporter.cpp +++ /dev/null @@ -1,191 +0,0 @@ -#include "AudioExporter.h" -#include "Main.h" -#include -#include -#include -#include "DisplayListExporter.h" - -void OTRExporter_Audio::WriteSampleEntryReference(ZAudio* audio, SampleEntry* entry, std::map samples, BinaryWriter* writer) -{ - writer->Write((uint8_t)(entry != nullptr ? 1 : 0)); - - if (entry != nullptr) - { - if (audio->sampleOffsets[entry->bankId].find(entry->sampleLoopOffset) != audio->sampleOffsets[entry->bankId].end()) - { - if (audio->sampleOffsets[entry->bankId][entry->sampleLoopOffset].find(entry->sampleDataOffset) != audio->sampleOffsets[entry->bankId][entry->sampleLoopOffset].end()) - { - writer->Write(StringHelper::Sprintf("audio/samples/%s", audio->sampleOffsets[entry->bankId][entry->sampleLoopOffset][entry->sampleDataOffset].c_str())); - } - else - writer->Write(entry->fileName); - } - else - writer->Write(entry->fileName); - } - else - writer->Write(""); -} - -void OTRExporter_Audio::WriteSampleEntry(SampleEntry* entry, BinaryWriter* writer) -{ - WriteHeader(nullptr, "", writer, LUS::ResourceType::SOH_AudioSample, 2); - - writer->Write(entry->codec); - writer->Write(entry->medium); - writer->Write(entry->unk_bit26); - writer->Write(entry->unk_bit25); - - writer->Write((uint32_t)entry->data.size()); - writer->Write((char*)entry->data.data(), entry->data.size()); - - writer->Write((uint32_t)(entry->loop.start)); - writer->Write((uint32_t)(entry->loop.end)); - writer->Write((uint32_t)(entry->loop.count)); - writer->Write((uint32_t)entry->loop.states.size()); - - for (size_t i = 0; i < entry->loop.states.size(); i++) - writer->Write((entry->loop.states[i])); - - writer->Write((uint32_t)(entry->book.order)); - writer->Write((uint32_t)(entry->book.npredictors)); - writer->Write((uint32_t)entry->book.books.size()); - - for (size_t i = 0; i < entry->book.books.size(); i++) - writer->Write((entry->book.books[i])); -} - -void OTRExporter_Audio::WriteSoundFontEntry(ZAudio* audio, SoundFontEntry* entry, std::map samples, BinaryWriter* writer) -{ - writer->Write((uint8_t)(entry != nullptr ? 1 : 0)); - - if (entry != nullptr) - { - WriteSampleEntryReference(audio, entry->sampleEntry, samples, writer); - writer->Write(entry->tuning); - } -} - -void OTRExporter_Audio::WriteEnvData(std::vector envelopes, BinaryWriter* writer) -{ - writer->Write((uint32_t)envelopes.size()); - - for (auto env : envelopes) - { - writer->Write(env->delay); - writer->Write(env->arg); - } -} - -void OTRExporter_Audio::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZAudio* audio = (ZAudio*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Audio, 2); - - // Write Samples as individual files - for (auto pair : audio->samples) - { - MemoryStream* sampleStream = new MemoryStream(); - BinaryWriter sampleWriter = BinaryWriter(sampleStream); - - writer->Write((uint32_t)pair.first); - WriteSampleEntry(pair.second, &sampleWriter); - - std::string basePath = ""; - - if (audio->sampleOffsets[pair.second->bankId].find(pair.second->sampleLoopOffset) != audio->sampleOffsets[pair.second->bankId].end()) - { - if (audio->sampleOffsets[pair.second->bankId][pair.second->sampleLoopOffset].find(pair.second->sampleDataOffset) != audio->sampleOffsets[pair.second->bankId][pair.second->sampleLoopOffset].end()) - basePath = StringHelper::Sprintf("samples/%s", audio->sampleOffsets[pair.second->bankId][pair.second->sampleLoopOffset][pair.second->sampleDataOffset].c_str()); - else - basePath = StringHelper::Sprintf("samples/sample_%08X", pair.first); - } - else - basePath = StringHelper::Sprintf("samples/sample_%08X", pair.first); - - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, basePath); - AddFile(fName, sampleStream->ToVector()); - } - - // Write the soundfont table - for (size_t i = 0; i < audio->soundFontTable.size(); i++) - { - MemoryStream* fntStream = new MemoryStream(); - BinaryWriter fntWriter = BinaryWriter(fntStream); - - WriteHeader(nullptr, "", &fntWriter, LUS::ResourceType::SOH_AudioSoundFont, 2); - - fntWriter.Write((uint32_t)i); - fntWriter.Write(audio->soundFontTable[i].medium); - fntWriter.Write(audio->soundFontTable[i].cachePolicy); - fntWriter.Write(audio->soundFontTable[i].data1); - fntWriter.Write(audio->soundFontTable[i].data2); - fntWriter.Write(audio->soundFontTable[i].data3); - - fntWriter.Write((uint32_t)audio->soundFontTable[i].drums.size()); - fntWriter.Write((uint32_t)audio->soundFontTable[i].instruments.size()); - fntWriter.Write((uint32_t)audio->soundFontTable[i].soundEffects.size()); - - for (size_t k = 0; k < audio->soundFontTable[i].drums.size(); k++) - { - fntWriter.Write(audio->soundFontTable[i].drums[k].releaseRate); - fntWriter.Write(audio->soundFontTable[i].drums[k].pan); - fntWriter.Write(audio->soundFontTable[i].drums[k].loaded); - - WriteEnvData(audio->soundFontTable[i].drums[k].env, &fntWriter); - - WriteSampleEntryReference(audio, audio->soundFontTable[i].drums[k].sample, audio->samples, &fntWriter); - fntWriter.Write(audio->soundFontTable[i].drums[k].tuning); - } - - for (size_t k = 0; k < audio->soundFontTable[i].instruments.size(); k++) - { - fntWriter.Write((uint8_t)audio->soundFontTable[i].instruments[k].isValidInstrument); - - fntWriter.Write(audio->soundFontTable[i].instruments[k].loaded); - fntWriter.Write(audio->soundFontTable[i].instruments[k].normalRangeLo); - fntWriter.Write(audio->soundFontTable[i].instruments[k].normalRangeHi); - fntWriter.Write(audio->soundFontTable[i].instruments[k].releaseRate); - - WriteEnvData(audio->soundFontTable[i].instruments[k].env, &fntWriter); - - WriteSoundFontEntry(audio, audio->soundFontTable[i].instruments[k].lowNotesSound, audio->samples, &fntWriter); - WriteSoundFontEntry(audio, audio->soundFontTable[i].instruments[k].normalNotesSound, audio->samples, &fntWriter); - WriteSoundFontEntry(audio, audio->soundFontTable[i].instruments[k].highNotesSound, audio->samples, &fntWriter); - } - - for (size_t k = 0; k < audio->soundFontTable[i].soundEffects.size(); k++) - { - WriteSoundFontEntry(audio, audio->soundFontTable[i].soundEffects[k], audio->samples, &fntWriter); - } - - //std::string fName = OTRExporter_DisplayList::GetPathToRes(res, StringHelper::Sprintf("fonts/font_%02X", i)); - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, StringHelper::Sprintf("fonts/%s", audio->soundFontNames[i].c_str())); - AddFile(fName, fntStream->ToVector()); - } - - // Write Sequences - for (size_t i = 0; i < audio->sequences.size(); i++) - { - auto seq = audio->sequences[i]; - - MemoryStream* seqStream = new MemoryStream(); - BinaryWriter seqWriter = BinaryWriter(seqStream); - - WriteHeader(nullptr, "", &seqWriter, LUS::ResourceType::SOH_AudioSequence, 2); - - seqWriter.Write((uint32_t)seq.size()); - seqWriter.Write(seq.data(), seq.size()); - seqWriter.Write((uint8_t)i); - seqWriter.Write((uint8_t)audio->sequenceTable[i].medium); - seqWriter.Write((uint8_t)audio->sequenceTable[i].cachePolicy); - seqWriter.Write((uint32_t)audio->fontIndices[i].size()); - - for (size_t k = 0; k < audio->fontIndices[i].size(); k++) - seqWriter.Write((uint8_t)audio->fontIndices[i][k]); - - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, StringHelper::Sprintf("sequences/%s", audio->seqNames[i].c_str())); - AddFile(fName, seqStream->ToVector()); - } -} diff --git a/OTRExporter/OTRExporter/AudioExporter.h b/OTRExporter/OTRExporter/AudioExporter.h deleted file mode 100644 index 13a8cc0a0..000000000 --- a/OTRExporter/OTRExporter/AudioExporter.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZAudio.h" -#include "Exporter.h" -#include - -class OTRExporter_Audio : public OTRExporter -{ -public: - void WriteSampleEntry(SampleEntry* entry, BinaryWriter* writer); - void WriteSampleEntryReference(ZAudio* audio, SampleEntry* entry, std::map samples, BinaryWriter* writer); - void WriteSoundFontEntry(ZAudio* audio, SoundFontEntry* entry, std::map samples, BinaryWriter* writer); - void WriteEnvData(std::vector envelopes, BinaryWriter* writer); - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/BackgroundExporter.cpp b/OTRExporter/OTRExporter/BackgroundExporter.cpp deleted file mode 100644 index f0f1a55f4..000000000 --- a/OTRExporter/OTRExporter/BackgroundExporter.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "BackgroundExporter.h" -#include "../ZAPD/ZFile.h" - -void OTRExporter_Background::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZBackground* bg = (ZBackground*)res; - - WriteHeader(bg, outPath, writer, LUS::ResourceType::SOH_Background); - - writer->Write((uint32_t)bg->GetRawDataSize()); - - auto data = bg->parent->GetRawData(); - writer->Write((char*)data.data() + bg->GetRawDataIndex(), bg->GetRawDataSize()); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/BackgroundExporter.h b/OTRExporter/OTRExporter/BackgroundExporter.h deleted file mode 100644 index 30c1adbbc..000000000 --- a/OTRExporter/OTRExporter/BackgroundExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZBackground.h" -#include "Exporter.h" -#include - -class OTRExporter_Background : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/BlobExporter.cpp b/OTRExporter/OTRExporter/BlobExporter.cpp deleted file mode 100644 index a547718e3..000000000 --- a/OTRExporter/OTRExporter/BlobExporter.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "BlobExporter.h" -#include "../ZAPD/ZFile.h" - -void OTRExporter_Blob::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZBlob* blob = (ZBlob*)res; - - WriteHeader(blob, outPath, writer, LUS::ResourceType::Blob); - - auto start = std::chrono::steady_clock::now(); - - writer->Write((uint32_t)blob->GetRawDataSize()); - - auto data = blob->parent->GetRawData(); - - for (size_t i = blob->GetRawDataIndex(); i < blob->GetRawDataIndex() + blob->GetRawDataSize(); i++) - writer->Write(data[i]); - - auto end = std::chrono::steady_clock::now(); - size_t diff = std::chrono::duration_cast(end - start).count(); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/BlobExporter.h b/OTRExporter/OTRExporter/BlobExporter.h deleted file mode 100644 index 43a262d5e..000000000 --- a/OTRExporter/OTRExporter/BlobExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZBlob.h" -#include "Exporter.h" -#include - -class OTRExporter_Blob : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/CMakeLists.txt b/OTRExporter/OTRExporter/CMakeLists.txt deleted file mode 100644 index 9d012af95..000000000 --- a/OTRExporter/OTRExporter/CMakeLists.txt +++ /dev/null @@ -1,245 +0,0 @@ -set(PROJECT_NAME OTRExporter) - -################################################################################ -# Source groups -################################################################################ -set(Header_Files - "AnimationExporter.h" - "ArrayExporter.h" - "AudioExporter.h" - "BackgroundExporter.h" - "BlobExporter.h" - "CollisionExporter.h" - "command_macros_base.h" - "CutsceneExporter.h" - "DisplayListExporter.h" - "Exporter.h" - "Main.h" - "MtxExporter.h" - "PathExporter.h" - "PlayerAnimationExporter.h" - "RoomExporter.h" - "SkeletonExporter.h" - "SkeletonLimbExporter.h" - "TextExporter.h" - "TextureExporter.h" - "VersionInfo.h" - "VtxExporter.h" - "z64cutscene.h" - "z64cutscene_commands.h" -) -source_group("Header Files" FILES ${Header_Files}) - -set(Source_Files - "AnimationExporter.cpp" - "ArrayExporter.cpp" - "AudioExporter.cpp" - "BackgroundExporter.cpp" - "BlobExporter.cpp" - "CollisionExporter.cpp" - "CutsceneExporter.cpp" - "DisplayListExporter.cpp" - "Exporter.cpp" - "Main.cpp" - "MtxExporter.cpp" - "PathExporter.cpp" - "PlayerAnimationExporter.cpp" - "RoomExporter.cpp" - "SkeletonExporter.cpp" - "SkeletonLimbExporter.cpp" - "TextExporter.cpp" - "TextureExporter.cpp" - "VersionInfo.cpp" - "VtxExporter.cpp" -) -source_group("Source Files" FILES ${Source_Files}) - -set(ALL_FILES - ${Header_Files} - ${Source_Files} -) - -################################################################################ -# Target -################################################################################ -add_library(${PROJECT_NAME} STATIC ${ALL_FILES}) - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") -use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}") -endif() - -set(ROOT_NAMESPACE OTRExporter) - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - set_target_properties(${PROJECT_NAME} PROPERTIES - VS_GLOBAL_KEYWORD "Win32Proj" - ) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - endif() -endif() -################################################################################ -# MSVC runtime library -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" - $<$: - MultiThreadedDebug - > - $<$: - MultiThreaded - > - $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> - ) - endif() - set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR}) -endif() -################################################################################ -# Compile definitions -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG" - ">" - "$<$:" - "NDEBUG" - ">" - "_CONSOLE;" - "_CRT_SECURE_NO_WARNINGS;" - "UNICODE;" - "_UNICODE" - STORMLIB_NO_AUTO_LINK - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG;" - "_CRT_SECURE_NO_WARNINGS" - ">" - "$<$:" - "NDEBUG" - ">" - "WIN32;" - "_CONSOLE;" - "UNICODE;" - "_UNICODE" - STORMLIB_NO_AUTO_LINK - ) - endif() -endif() - -if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG" - ">" - "$<$:" - "NDEBUG" - ">" - "_CONSOLE;" - "_CRT_SECURE_NO_WARNINGS;" - "UNICODE;" - "_UNICODE" - ) -endif() -################################################################################ -# Compile and link options -################################################################################ - -target_include_directories(${PROJECT_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/ZAPD/ - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/include - # TODO: these should no longer be necessary if we were to link against LUS - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/Mercury - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/tinyxml2 - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/ZAPDUtils - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/StormLib/src - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/spdlog/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/nlohmann-json/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/resource - ${CMAKE_CURRENT_SOURCE_DIR}/../../soh/soh - . -) - -if(MSVC) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /Oi; - /Gy - > - /permissive-; - /sdl; - /W3; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /Oi; - /Gy - > - /permissive-; - /sdl; - /W3; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - endif() - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /OPT:REF; - /OPT:ICF - > - /SUBSYSTEM:CONSOLE - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /DEBUG; - /OPT:REF; - /OPT:ICF; - /INCREMENTAL:NO - > - /SUBSYSTEM:CONSOLE - ) - endif() -endif() - -if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang") - target_compile_options(${PROJECT_NAME} PRIVATE - -Wall -Wextra -Wno-error - -Wno-unused-parameter - -Wno-unused-function - -Wno-unused-variable - -Wno-missing-field-initializers - -Wno-parentheses - -Wno-narrowing - $<$:-Wno-deprecated-enum-enum-conversion> - ) -endif() -################################################################################ -# Dependencies -################################################################################ -add_dependencies(${PROJECT_NAME} - libultraship -) - -# Link with other targets. -target_link_libraries(${PROJECT_NAME} PUBLIC "${ADDITIONAL_LIBRARY_DEPENDENCIES}") - diff --git a/OTRExporter/OTRExporter/CollisionExporter.cpp b/OTRExporter/OTRExporter/CollisionExporter.cpp deleted file mode 100644 index cbcdbb35f..000000000 --- a/OTRExporter/OTRExporter/CollisionExporter.cpp +++ /dev/null @@ -1,84 +0,0 @@ -#include "CollisionExporter.h" -#include - -void OTRExporter_Collision::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZCollisionHeader* col = (ZCollisionHeader*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_CollisionHeader); - - writer->Write(col->absMinX); - writer->Write(col->absMinY); - writer->Write(col->absMinZ); - - writer->Write(col->absMaxX); - writer->Write(col->absMaxY); - writer->Write(col->absMaxZ); - - writer->Write((uint32_t)col->vertices.size()); - - for (uint16_t i = 0; i < col->vertices.size(); i++) - { - writer->Write(col->vertices[i].scalars[0].scalarData.s16); - writer->Write(col->vertices[i].scalars[1].scalarData.s16); - writer->Write(col->vertices[i].scalars[2].scalarData.s16); - } - - writer->Write((uint32_t)col->polygons.size()); - - for (uint16_t i = 0; i < col->polygons.size(); i++) - { - writer->Write(col->polygons[i].type); - writer->Write(col->polygons[i].vtxA); - writer->Write(col->polygons[i].vtxB); - writer->Write(col->polygons[i].vtxC); - writer->Write(col->polygons[i].normX); - writer->Write(col->polygons[i].normY); - writer->Write(col->polygons[i].normZ); - writer->Write(col->polygons[i].dist); - } - - writer->Write((uint32_t)col->PolygonTypes.size()); - - for (uint16_t i = 0; i < col->PolygonTypes.size(); i++) { - writer->Write(col->PolygonTypes[i].data[1]); - writer->Write(col->PolygonTypes[i].data[0]); - } - - writer->Write((uint32_t)col->camData->entries.size()); - - for (auto entry : col->camData->entries) - { - auto camPosDecl = col->parent->GetDeclarationRanged(Seg2Filespace(entry->cameraPosDataSeg, col->parent->baseAddress)); - - int idx = 0; - - if (camPosDecl != nullptr) - idx = ((entry->cameraPosDataSeg & 0x00FFFFFF) - camPosDecl->address) / 6; - - writer->Write(entry->cameraSType); - writer->Write(entry->numData); - writer->Write((uint32_t)idx); - } - - writer->Write((uint32_t)col->camData->cameraPositionData.size()); - - for (auto entry : col->camData->cameraPositionData) - { - writer->Write(entry->x); - writer->Write(entry->y); - writer->Write(entry->z); - } - - writer->Write((uint32_t)col->waterBoxes.size()); - - for (auto waterBox : col->waterBoxes) - { - writer->Write(waterBox.xMin); - writer->Write(waterBox.ySurface); - writer->Write(waterBox.zMin); - writer->Write(waterBox.xLength); - writer->Write(waterBox.zLength); - writer->Write(waterBox.properties); - } -} diff --git a/OTRExporter/OTRExporter/CollisionExporter.h b/OTRExporter/OTRExporter/CollisionExporter.h deleted file mode 100644 index 536d65344..000000000 --- a/OTRExporter/OTRExporter/CollisionExporter.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZCollision.h" -#include "Exporter.h" - -class OTRExporter_Collision : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/CutsceneExporter.cpp b/OTRExporter/OTRExporter/CutsceneExporter.cpp deleted file mode 100644 index 2194ce65a..000000000 --- a/OTRExporter/OTRExporter/CutsceneExporter.cpp +++ /dev/null @@ -1,444 +0,0 @@ -#include "CutsceneExporter.h" -#include - -void OTRExporter_Cutscene::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZCutscene* cs = (ZCutscene*)res; - - WriteHeader(cs, outPath, writer, LUS::ResourceType::SOH_Cutscene); - - writer->Write((uint32_t)0); - - const auto currentStream = writer->GetBaseAddress(); - - writer->Write(CS_BEGIN_CUTSCENE(cs->numCommands, cs->endFrame)); - - for (size_t i = 0; i < cs->commands.size(); i++) - { - switch (cs->commands[i]->commandID) - { - case (uint32_t)CutsceneCommands::SetCameraPos: - { - CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i]; - - writer->Write(CS_CMD_CAM_EYE); - writer->Write(CMD_HH(0x0001, ((CutsceneCommandSetCameraPos*)cs->commands[i])->startFrame)); - writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000)); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneCameraPoint* point = (CutsceneCameraPoint*)e; - writer->Write(CMD_BBH(point->continueFlag, point->cameraRoll, point->nextPointFrame)); - writer->Write(point->viewAngle); - writer->Write(CMD_HH(point->posX, point->posY)); - writer->Write(CMD_HH(point->posZ, point->unused)); - } - } - break; - case (uint32_t)CutsceneCommands::SetCameraFocus: - { - CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i]; - - writer->Write(CS_CMD_CAM_AT); - writer->Write(CMD_HH(0x0001, cmdCamPos->startFrame)); - writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000)); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneCameraPoint* point = (CutsceneCameraPoint*)e; - writer->Write(CMD_BBH(point->continueFlag, point->cameraRoll, point->nextPointFrame)); - writer->Write(point->viewAngle); - writer->Write(CMD_HH(point->posX, point->posY)); - writer->Write(CMD_HH(point->posZ, point->unused)); - } - break; - } - case (uint32_t)CutsceneCommands::Misc: - { - writer->Write(CS_CMD_MISC); - writer->Write((uint32_t)CMD_W((cs->commands[i])->entries.size())); - for (const auto& e : cs->commands[i]->entries) //All in OOT seem to only have 1 entry - { - CutsceneSubCommandEntry_GenericCmd* cmd = (CutsceneSubCommandEntry_GenericCmd*)e; - writer->Write(CMD_HH(cmd->base, cmd->startFrame)); - writer->Write(CMD_HH(cmd->endFrame, cmd->pad)); - writer->Write(CMD_W(cmd->unused1)); - writer->Write(CMD_W(cmd->unused2)); - writer->Write(CMD_W(cmd->unused3)); - writer->Write(CMD_W(cmd->unused4)); - writer->Write(CMD_W(cmd->unused5)); - writer->Write(CMD_W(cmd->unused6)); - writer->Write(CMD_W(cmd->unused7)); - writer->Write(CMD_W(cmd->unused8)); - writer->Write(CMD_W(cmd->unused9)); - writer->Write(CMD_W(cmd->unused10)); - } - break; - } - case (uint32_t)CutsceneCommands::SetLighting: - { - writer->Write(CS_CMD_SET_LIGHTING); - writer->Write((uint32_t)CMD_W((cs->commands[i])->entries.size())); - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_GenericCmd* cmd = (CutsceneSubCommandEntry_GenericCmd*)e; - writer->Write(CMD_HH(cmd->base, cmd->startFrame)); - writer->Write(CMD_HH(cmd->endFrame, cmd->pad)); - writer->Write(CMD_W(cmd->unused1)); - writer->Write(CMD_W(cmd->unused2)); - writer->Write(CMD_W(cmd->unused3)); - writer->Write(CMD_W(cmd->unused4)); - writer->Write(CMD_W(cmd->unused5)); - writer->Write(CMD_W(cmd->unused6)); - writer->Write(CMD_W(cmd->unused7)); - writer->Write((uint32_t)0x0); - writer->Write((uint32_t)0x0); - writer->Write((uint32_t)0x0); - } - break; - } - case (uint32_t)CutsceneCommands::SetCameraPosLink: - { - CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i]; - - writer->Write(CS_CMD_CAM_EYE_REL_TO_PLAYER); - writer->Write(CMD_HH(0x0001, ((CutsceneCommandSetCameraPos*)cs->commands[i])->startFrame)); - writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000)); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneCameraPoint* point = (CutsceneCameraPoint*)e; - writer->Write(CMD_BBH(point->continueFlag, point->cameraRoll, point->nextPointFrame)); - writer->Write(point->viewAngle); - writer->Write(CMD_HH(point->posX, point->posY)); - writer->Write(CMD_HH(point->posZ, point->unused)); - } - break; - } - case (uint32_t)CutsceneCommands::SetCameraFocusLink: - { - CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i]; - - writer->Write(CS_CMD_CAM_AT_REL_TO_PLAYER); - writer->Write(CMD_HH(0x0001, ((CutsceneCommandSetCameraPos*)cs->commands[i])->startFrame)); - writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000)); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneCameraPoint* point = (CutsceneCameraPoint*)e; - writer->Write(CMD_BBH(point->continueFlag, point->cameraRoll, point->nextPointFrame)); - writer->Write(point->viewAngle); - writer->Write(CMD_HH(point->posX, point->posY)); - writer->Write(CMD_HH(point->posZ, point->unused)); - } - break; - } - - case (uint32_t)CutsceneCommands::Cmd07: // Not used in OOT - break; - case (uint32_t)CutsceneCommands::Cmd08: // Not used in OOT - break; - - case (uint32_t)CutsceneCommands::Cmd09: - { - writer->Write(CS_CMD_09); - writer->Write((uint32_t)CMD_W(((CutsceneCommand_Rumble*)cs->commands[i])->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_Rumble* r = (CutsceneSubCommandEntry_Rumble*)e; - writer->Write(CMD_HH(r->base, r->startFrame)); - writer->Write(CMD_HBB(e->endFrame, r->unk_06, r->unk_07)); - writer->Write(CMD_BBH(r->unk_08, r->unk_09, r->unk_0A)); - } - break; - } - case 0x15://Both unused in OoT - case 0x1A://(uint32_t)CutsceneCommands::Unknown: - { -#if 0 - CutsceneCommandUnknown* cmdUnk = (CutsceneCommandUnknown*)cs->commands[i]; - writer->Write((uint32_t)cs->commands[i]->commandID); - writer->Write((uint32_t)cmdUnk->entries.size()); - - for (const auto e : cmdUnk->entries) - { - writer->Write(CMD_W(e->unused0)); - writer->Write(CMD_W(e->unused1)); - writer->Write(CMD_W(e->unused2)); - writer->Write(CMD_W(e->unused3)); - writer->Write(CMD_W(e->unused4)); - writer->Write(CMD_W(e->unused5)); - writer->Write(CMD_W(e->unused6)); - writer->Write(CMD_W(e->unused7)); - writer->Write(CMD_W(e->unused8)); - writer->Write(CMD_W(e->unused9)); - writer->Write(CMD_W(e->unused10)); - writer->Write(CMD_W(e->unused11)); - } -#endif - } - break; - case (uint32_t)CutsceneCommands::Textbox: - { - writer->Write(CS_CMD_TEXTBOX); - writer->Write((uint32_t)CMD_W((cs->commands[i])->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_TextBox* textBox = (CutsceneSubCommandEntry_TextBox*)e; - if (textBox->base == 0xFFFF) // CS_TEXT_NONE - { - writer->Write(CMD_HH(0xFFFF, textBox->startFrame)); - writer->Write(CMD_HH(textBox->endFrame, 0xFFFF)); - writer->Write(CMD_HH(0xFFFF, 0xFFFF)); - } - else // CS_TEXT_DISPLAY_TEXTBOX - { - writer->Write(CMD_HH(textBox->base, textBox->startFrame)); - writer->Write(CMD_HH(textBox->endFrame, textBox->type)); - writer->Write(CMD_HH(textBox->textId1, textBox->textId2)); - } - } - break; - } - case 10: //ActorAction0 - case (uint32_t)CutsceneCommands::SetActorAction1: - case 17: - case 18: - case 23: - case 34: - case 39: - case 46: - case 76: - case 85: - case 93: - case 105: - case 107: - case 110: - case 119: - case 123: - case 138: - case 139: - case 144: - case (uint32_t)CutsceneCommands::SetActorAction2: - case 16: - case 24: - case 35: - case 40: - case 48: - case 64: - case 68: - case 70: - case 78: - case 80: - case 94: - case 116: - case 118: - case 120: - case 125: - case 131: - case 141: - case (uint32_t)CutsceneCommands::SetActorAction3: - case 36: - case 41: - case 50: - case 67: - case 69: - case 72: - case 74: - case 81: - case 106: - case 117: - case 121: - case 126: - case 132: - case (uint32_t)CutsceneCommands::SetActorAction4: - case 37: - case 42: - case 51: - case 53: - case 63: - case 65: - case 66: - case 75: - case 82: - case 108: - case 127: - case 133: - case (uint32_t)CutsceneCommands::SetActorAction5: - case 38: - case 43: - case 47: - case 54: - case 79: - case 83: - case 128: - case 135: - case (uint32_t)CutsceneCommands::SetActorAction6: - case 55: - case 77: - case 84: - case 90: - case 129: - case 136: - case (uint32_t)CutsceneCommands::SetActorAction7: - case 52: - case 57: - case 58: - case 88: - case 115: - case 130: - case 137: - case (uint32_t)CutsceneCommands::SetActorAction8: - case 60: - case 89: - case 111: - case 114: - case 134: - case 142: - case (uint32_t)CutsceneCommands::SetActorAction9: - case (uint32_t)CutsceneCommands::SetActorAction10: - { - writer->Write((uint32_t)(CutsceneCommands)cs->commands[i]->commandID); - writer->Write((uint32_t)CMD_W(cs->commands[i]->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_ActorAction* actorAct = (CutsceneSubCommandEntry_ActorAction*)e; - writer->Write(CMD_HH(actorAct->base, actorAct->startFrame)); - writer->Write(CMD_HH(actorAct->endFrame, actorAct->rotX)); - writer->Write(CMD_HH(actorAct->rotY, actorAct->rotZ)); - writer->Write(CMD_W(actorAct->startPosX)); - writer->Write(CMD_W(actorAct->startPosY)); - writer->Write(CMD_W(actorAct->startPosZ)); - writer->Write(CMD_W(actorAct->endPosX)); - writer->Write(CMD_W(actorAct->endPosY)); - writer->Write(CMD_W(actorAct->endPosZ)); - writer->Write(CMD_W(actorAct->normalX)); - writer->Write(CMD_W(actorAct->normalY)); - writer->Write(CMD_W(actorAct->normalZ)); - } - - break; - } - case (uint32_t)CutsceneCommands::SetSceneTransFX: - { - CutsceneCommandSceneTransFX* cmdTFX = (CutsceneCommandSceneTransFX*)cs->commands[i]; - - writer->Write(CS_CMD_SCENE_TRANS_FX); - writer->Write((uint32_t)1); - writer->Write(CMD_HH((((CutsceneCommandSceneTransFX*)cs->commands[i])->base), ((CutsceneCommandSceneTransFX*)cs->commands[i])->startFrame)); - writer->Write(CMD_HH((((CutsceneCommandSceneTransFX*)cs->commands[i])->endFrame), ((CutsceneCommandSceneTransFX*)cs->commands[i])->endFrame)); - break; - } - case (uint32_t)CutsceneCommands::PlayBGM: - { - writer->Write(CS_CMD_PLAYBGM); - writer->Write((uint32_t)CMD_W(cs->commands[i]->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_GenericCmd* cmd = (CutsceneSubCommandEntry_GenericCmd*)e; - writer->Write(CMD_HH(cmd->base, cmd->startFrame)); - writer->Write(CMD_HH(cmd->endFrame, cmd->pad)); - writer->Write(CMD_W(cmd->unused1)); - writer->Write(CMD_W(cmd->unused2)); - writer->Write(CMD_W(cmd->unused3)); - writer->Write(CMD_W(cmd->unused4)); - writer->Write(CMD_W(cmd->unused5)); - writer->Write(CMD_W(cmd->unused6)); - writer->Write(CMD_W(cmd->unused7)); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - } - break; - } - case (uint32_t)CutsceneCommands::StopBGM: - { - writer->Write(CS_CMD_STOPBGM); - writer->Write((uint32_t)CMD_W(cs->commands[i]->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_GenericCmd* cmd = (CutsceneSubCommandEntry_GenericCmd*)e; - writer->Write(CMD_HH(cmd->base, cmd->startFrame)); - writer->Write(CMD_HH(cmd->endFrame, cmd->pad)); - writer->Write(CMD_W(cmd->unused1)); - writer->Write(CMD_W(cmd->unused2)); - writer->Write(CMD_W(cmd->unused3)); - writer->Write(CMD_W(cmd->unused4)); - writer->Write(CMD_W(cmd->unused5)); - writer->Write(CMD_W(cmd->unused6)); - writer->Write(CMD_W(cmd->unused7)); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - } - break; - } - case (uint32_t)CutsceneCommands::FadeBGM: - { - writer->Write(CS_CMD_FADEBGM); - writer->Write((uint32_t)CMD_W(cs->commands[i]->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_GenericCmd* cmd = (CutsceneSubCommandEntry_GenericCmd*)e; - writer->Write(CMD_HH(cmd->base, cmd->startFrame)); - writer->Write(CMD_HH(cmd->endFrame, cmd->pad)); - writer->Write(CMD_W(cmd->unused1)); - writer->Write(CMD_W(cmd->unused2)); - writer->Write(CMD_W(cmd->unused3)); - writer->Write(CMD_W(cmd->unused4)); - writer->Write(CMD_W(cmd->unused5)); - writer->Write(CMD_W(cmd->unused6)); - writer->Write(CMD_W(cmd->unused7)); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - writer->Write((uint32_t)0); - } - break; - } - case (uint32_t)CutsceneCommands::SetTime: - { - writer->Write(CS_CMD_SETTIME); - writer->Write((uint32_t)CMD_W(cs->commands[i]->entries.size())); - - for (const auto& e : cs->commands[i]->entries) - { - CutsceneSubCommandEntry_SetTime* t = (CutsceneSubCommandEntry_SetTime*)e; - writer->Write(CMD_HH(t->base, t->startFrame)); - writer->Write(CMD_HBB(t->endFrame, t->hour, t->minute)); - writer->Write((uint32_t)CMD_W(t->unk_08)); - } - break; - } - case (uint32_t)CutsceneCommands::Terminator: - { - CutsceneCommand_Terminator* t = (CutsceneCommand_Terminator*)cs->commands[i]; - writer->Write(CS_CMD_TERMINATOR); - writer->Write((uint32_t)1); - writer->Write(CMD_HH(t->base, t->startFrame)); - writer->Write(CMD_HH(t->endFrame, t->endFrame)); - break; - } - default: - { - //writer->Write((uint32_t)cs->commands[i]->commandID); - printf("Undefined CS Opcode: %04X\n", cs->commands[i]->commandID); - } - break; - } - } - - //CS_END - writer->Write(0xFFFFFFFF); - writer->Write((uint32_t)0); - - const auto endStream = writer->GetBaseAddress(); - writer->Seek((uint32_t)currentStream - 4, SeekOffsetType::Start); - writer->Write((uint32_t)((endStream - currentStream) / 4)); - writer->Seek((uint32_t)endStream, SeekOffsetType::Start); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/CutsceneExporter.h b/OTRExporter/OTRExporter/CutsceneExporter.h deleted file mode 100644 index 96903fdba..000000000 --- a/OTRExporter/OTRExporter/CutsceneExporter.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once -#include "ZResource.h" -#include "ZCutscene.h" -#include "z64cutscene_commands.h" -#include "Exporter.h" - -class OTRExporter_Cutscene : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/DisplayListExporter.cpp b/OTRExporter/OTRExporter/DisplayListExporter.cpp deleted file mode 100644 index 81863f09d..000000000 --- a/OTRExporter/OTRExporter/DisplayListExporter.cpp +++ /dev/null @@ -1,907 +0,0 @@ -#include "DisplayListExporter.h" -#include "Main.h" -#include "../ZAPD/ZFile.h" -#include -#include -#include "StrHash64/StrHash64.h" -#include "spdlog/spdlog.h" -#include -#include -#include -#include -#include "MtxExporter.h" -#include -#include "VersionInfo.h" - -#define GFX_SIZE 8 - -#define gsDPSetCombineLERP_NoMacros(a0, b0, c0, d0, Aa0, Ab0, Ac0, Ad0, \ - a1, b1, c1, d1, Aa1, Ab1, Ac1, Ad1) \ -{ \ - _SHIFTL(G_SETCOMBINE, 24, 8) | \ - _SHIFTL(GCCc0w0(a0, c0, \ - Aa0, Ac0) | \ - GCCc1w0(a1, c1), 0, 24), \ - (unsigned int)(GCCc0w1(b0, d0, \ - Ab0, Ad0) | \ - GCCc1w1(b1, Aa1, \ - Ac1, d1, \ - Ab1, Ad1)) \ -} - -#define gsSPBranchLessZraw2(dl, vtx, zval) \ -{ _SHIFTL(G_BRANCH_Z,24,8)|_SHIFTL((vtx)*5,12,12)|_SHIFTL((vtx)*2,0,12),\ - (unsigned int)(zval), } - -#define gsSPBranchLessZraw3(dl) \ -{ _SHIFTL(G_RDPHALF_1,24,8), \ - (unsigned int)(dl), } - -#define gsDPWordLo(wordlo) \ - gsImmp1(G_RDPHALF_2, (unsigned int)(wordlo)) - -#define gsSPTextureRectangle2(xl, yl, xh, yh, tile) \ -{ (_SHIFTL(G_TEXRECT, 24, 8) | _SHIFTL(xh, 12, 12) | _SHIFTL(yh, 0, 12)),\ - (_SHIFTL(tile, 24, 3) | _SHIFTL(xl, 12, 12) | _SHIFTL(yl, 0, 12)) } - -void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZDisplayList* dList = (ZDisplayList*)res; - - //printf("Exporting DList %s\n", dList->GetName().c_str()); - - WriteHeader(res, outPath, writer, LUS::ResourceType::DisplayList); - - while (writer->GetBaseAddress() % 8 != 0) - writer->Write((uint8_t)0xFF); - - // DEBUG: Write in a marker - Declaration* dbgDecl = dList->parent->GetDeclaration(dList->GetRawDataIndex()); - std::string dbgName = StringHelper::Sprintf("%s/%s", GetParentFolderName(res).c_str(), dbgDecl->varName.c_str()); - uint64_t hash = CRC64(dbgName.c_str()); - writer->Write((uint32_t)(G_MARKER << 24)); - writer->Write((uint32_t)0xBEEFBEEF); - writer->Write((uint32_t)(hash >> 32)); - writer->Write((uint32_t)(hash & 0xFFFFFFFF)); - - auto dlStart = std::chrono::steady_clock::now(); - - //for (auto data : dList->instructions) - for (size_t dataIdx = 0; dataIdx < dList->instructions.size(); dataIdx++) - { - auto data = dList->instructions[dataIdx]; - uint32_t word0 = 0; - uint32_t word1 = 0; - uint8_t opcode = (uint8_t)(data >> 56); - F3DZEXOpcode opF3D = (F3DZEXOpcode)opcode; - - if ((int)opF3D == G_DL)// || (int)opF3D == G_BRANCH_Z) - opcode = (uint8_t)G_DL_OTR_HASH; - - if ((int)opF3D == G_MTX) - opcode = (uint8_t)G_MTX_OTR; - - if ((int)opF3D == G_BRANCH_Z) - opcode = (uint8_t)G_BRANCH_Z_OTR; - - if ((int)opF3D == G_VTX) - opcode = (uint8_t)G_VTX_OTR_HASH; - - if ((int)opF3D == G_SETTIMG) - opcode = (uint8_t)G_SETTIMG_OTR_HASH; - - word0 += (opcode << 24); - - switch ((int)opF3D) - { - case G_NOOP: - { - Gfx value = {gsDPNoOp()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_ENDDL: - { - Gfx value = {gsSPEndDisplayList()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_MODIFYVTX: - { - int32_t ww = (data & 0x00FF000000000000ULL) >> 48; - int32_t nnnn = (data & 0x0000FFFF00000000ULL) >> 32; - int32_t vvvvvvvv = (data & 0x00000000FFFFFFFFULL); - - Gfx value = {gsSPModifyVertex(nnnn / 2, ww, vvvvvvvv)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - default: - { - printf("Undefined opcode: %02X\n", opcode); - //word0 = _byteswap_ulong((uint32_t)(data >> 32)); - //word1 = _byteswap_ulong((uint32_t)(data & 0xFFFFFFFF)); - } - break; - case G_GEOMETRYMODE: - { - int32_t cccccc = (data & 0x00FFFFFF00000000) >> 32; - int32_t ssssssss = (data & 0xFFFFFFFF); - - Gfx value = {gsSPGeometryMode(~cccccc, ssssssss)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPPIPESYNC: - { - Gfx value = {gsDPPipeSync()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPLOADSYNC: - { - Gfx value = {gsDPLoadSync()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPTILESYNC: - { - Gfx value = {gsDPTileSync()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPFULLSYNC: - { - Gfx value = {gsDPFullSync()}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPSETOTHERMODE: - { - int32_t hhhhhh = (data & 0x00FFFFFF00000000) >> 32; - int32_t llllllll = (data & 0x00000000FFFFFFFF); - - Gfx value = {gsDPSetOtherMode(hhhhhh, llllllll)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_POPMTX: - { - Gfx value = {gsSPPopMatrix(data)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETENVCOLOR: - { - uint8_t r = (uint8_t)((data & 0xFF000000) >> 24); - uint8_t g = (uint8_t)((data & 0x00FF0000) >> 16); - uint8_t b = (uint8_t)((data & 0xFF00FF00) >> 8); - uint8_t a = (uint8_t)((data & 0x000000FF) >> 0); - - Gfx value = {gsDPSetEnvColor(r, g, b, a)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_MTX: - { - if ((!Globals::Instance->HasSegment(GETSEGNUM(data), res->parent->workerID)) || ((data & 0xFFFFFFFF) == 0x07000000)) // En_Zf and En_Ny place a DL in segment 7 - { - uint32_t pp = (data & 0x000000FF00000000) >> 32; - uint32_t mm = (data & 0x00000000FFFFFFFF); - - pp ^= G_MTX_PUSH; - - mm = (mm & 0x0FFFFFFF) + 1; - - Gfx value = {gsSPMatrix(mm, pp)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - else - { - uint32_t pp = (data & 0x000000FF00000000) >> 32; - uint32_t mm = (data & 0x00000000FFFFFFFF); - pp ^= G_MTX_PUSH; - - Gfx value = {gsSPMatrix(mm, pp)}; - word0 = value.words.w0; - word1 = value.words.w1; - - word0 = (word0 & 0x00FFFFFF) + (G_MTX_OTR << 24); - - Declaration* mtxDecl = dList->parent->GetDeclaration(GETSEGOFFSET(mm)); - - int bp = 0; - - writer->Write(word0); - writer->Write(word1); - - if (mtxDecl != nullptr) - { - std::string vName = StringHelper::Sprintf("%s/%s", (GetParentFolderName(res).c_str()), mtxDecl->varName.c_str()); - - uint64_t hash = CRC64(vName.c_str()); - - word0 = hash >> 32; - word1 = hash & 0xFFFFFFFF; - } - else - { - word0 = 0; - word1 = 0; - spdlog::error(StringHelper::Sprintf("dListDecl == nullptr! Addr = {:08X}", GETSEGOFFSET(data))); - } - } - } - break; - case G_LOADBLOCK: - { - int32_t sss = (data & 0x00FFF00000000000) >> 48; - int32_t ttt = (data & 0x00000FFF00000000) >> 36; - int32_t i = (data & 0x000000000F000000) >> 24; - int32_t xxx = (data & 0x0000000000FFF000) >> 12; - int32_t ddd = (data & 0x0000000000000FFF); - - Gfx value = {gsDPLoadBlock(i, sss, ttt, xxx, ddd)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_CULLDL: - { - int32_t vvvv = (data & 0xFFFF00000000) >> 32; - int32_t wwww = (data & 0x0000FFFF); - - Gfx value = {gsSPCullDisplayList(vvvv / 2, wwww / 2)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_RDPHALF_1: - { - auto data2 = dList->instructions[dataIdx + 1]; - - if ((data2 >> 56) != G_BRANCH_Z) - { - uint32_t a = (data & 0x00FFF00000000000) >> 44; - uint32_t b = (data & 0x00000FFF00000000) >> 32; - uint32_t z = (data & 0x00000000FFFFFFFF) >> 0; - uint32_t h = (data & 0xFFFFFFFF); - - Gfx value = {gsSPBranchLessZraw3(h & 0x00FFFFFF)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - else - { - word0 = (G_NOOP << 24); - word1 = 0; - } - } - break; - case G_RDPHALF_2: - { - Gfx value = {gsDPWordLo(data & 0xFFFFFFFF)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_TEXRECT: - { - int32_t xxx = (data & 0x00FFF00000000000) >> 44; - int32_t yyy = (data & 0x00000FFF00000000) >> 32; - int32_t i = (data & 0x000000000F000000) >> 24; - int32_t XXX = (data & 0x0000000000FFF000) >> 12; - int32_t YYY = (data & 0x0000000000000FFF); - - Gfx value = {gsSPTextureRectangle2(XXX, YYY, xxx, yyy, i)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_BRANCH_Z: - { - uint32_t a = (data & 0x00FFF00000000000) >> 44; - uint32_t b = (data & 0x00000FFF00000000) >> 32; - uint32_t z = (data & 0x00000000FFFFFFFF) >> 0; - uint32_t h = (data & 0xFFFFFFFF); - - auto data2 = dList->instructions[dataIdx - 1]; - uint32_t dListPtr = GETSEGOFFSET(data2); - - Declaration* dListDecl = dList->parent->GetDeclaration(dListPtr); - - int bp = 0; - - Gfx value = {gsSPBranchLessZraw2(0xDEADABCD, (a / 5) | (b / 2), z)}; - word0 = (value.words.w0 & 0x00FFFFFF) + (G_BRANCH_Z_OTR << 24); - word1 = value.words.w1; - - writer->Write(word0); - writer->Write(word1); - - if (dListDecl != nullptr) - { - std::string vName = StringHelper::Sprintf("%s/%s", (GetParentFolderName(res).c_str()), dListDecl->varName.c_str()); - - uint64_t hash = CRC64(vName.c_str()); - - word0 = hash >> 32; - word1 = hash & 0xFFFFFFFF; - } - else - { - word0 = 0; - word1 = 0; - spdlog::error(StringHelper::Sprintf("dListDecl == nullptr! Addr = {:08X}", GETSEGOFFSET(data))); - } - - for (size_t i = 0; i < dList->otherDLists.size(); i++) - { - Declaration* dListDecl2 = dList->parent->GetDeclaration(GETSEGOFFSET(dList->otherDLists[i]->GetRawDataIndex())); - - if (dListDecl2 != nullptr) - { - //std::string fName = StringHelper::Sprintf("%s\\%s", GetParentFolderName(res).c_str(), dListDecl2->varName.c_str()); - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, dListDecl2->varName.c_str()); - - if (files.find(fName) == files.end() && !DiskFile::Exists("Extract/" + fName)) - { - MemoryStream* dlStream = new MemoryStream(); - BinaryWriter dlWriter = BinaryWriter(dlStream); - - Save(dList->otherDLists[i], outPath, &dlWriter); - AddFile(fName, dlStream->ToVector()); - } - } - else - { - spdlog::error(StringHelper::Sprintf("dListDecl2 == nullptr! Addr = {:08X}", GETSEGOFFSET(data))); - } - } - - //Gfx value = gsSPBranchLessZraw2(h & 0x00FFFFFF, (a / 5) | (b / 2), z); - //word0 = value.words.w0; - //word1 = value.words.w1; - } - break; - //case G_BRANCH_Z: - case G_DL: - { - if ((!Globals::Instance->HasSegment(GETSEGNUM(data), res->parent->workerID) && (int)opF3D != G_BRANCH_Z) - || ((data & 0xFFFFFFFF) == 0x07000000)) // En_Zf and En_Ny place a DL in segment 7 - { - int32_t pp = (data & 0x00FF000000000000) >> 56; - - Gfx value; - - u32 dListVal = (data & 0x0FFFFFFF) + 1; - - if (pp != 0) - value = {gsSPBranchList(dListVal)}; - else - value = {gsSPDisplayList(dListVal)}; - - word0 = value.words.w0; - word1 = value.words.w1; - } - else - { - uint32_t dListPtr = GETSEGOFFSET(data); - - if ((int)opF3D == G_BRANCH_Z) - { - auto data2 = dList->instructions[dataIdx - 1]; - dListPtr = GETSEGOFFSET(data2); - } - else - { - int bp = 0; - } - - Declaration* dListDecl = dList->parent->GetDeclaration(dListPtr); - - int bp = 0; - - writer->Write(word0); - writer->Write(word1); - - if (dListDecl != nullptr) - { - std::string vName = StringHelper::Sprintf("%s/%s", (GetParentFolderName(res).c_str()), dListDecl->varName.c_str()); - - uint64_t hash = CRC64(vName.c_str()); - - word0 = hash >> 32; - word1 = hash & 0xFFFFFFFF; - } - else - { - word0 = 0; - word1 = 0; - spdlog::error(StringHelper::Sprintf("dListDecl == nullptr! Addr = {:08X}", GETSEGOFFSET(data))); - } - - for (size_t i = 0; i < dList->otherDLists.size(); i++) - { - Declaration* dListDecl2 = dList->parent->GetDeclaration(GETSEGOFFSET(dList->otherDLists[i]->GetRawDataIndex())); - - if (dListDecl2 != nullptr) - { - //std::string fName = StringHelper::Sprintf("%s\\%s", GetParentFolderName(res).c_str(), dListDecl2->varName.c_str()); - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, dListDecl2->varName.c_str()); - - if (files.find(fName) == files.end() && !DiskFile::Exists("Extract/" + fName)) - { - MemoryStream* dlStream = new MemoryStream(); - BinaryWriter dlWriter = BinaryWriter(dlStream); - - Save(dList->otherDLists[i], outPath, &dlWriter); - - AddFile(fName, dlStream->ToVector()); - } - } - else - { - spdlog::error(StringHelper::Sprintf("dListDecl2 == nullptr! Addr = {:08X}", GETSEGOFFSET(data))); - } - } - } - } - break; - case G_TEXTURE: - { - int32_t ____ = (data & 0x0000FFFF00000000) >> 32; - int32_t ssss = (data & 0x00000000FFFF0000) >> 16; - int32_t tttt = (data & 0x000000000000FFFF); - int32_t lll = (____ & 0x3800) >> 11; - int32_t ddd = (____ & 0x700) >> 8; - int32_t nnnnnnn = (____ & 0xFE) >> 1; - - Gfx value = {gsSPTexture(ssss, tttt, lll, ddd, nnnnnnn)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_TRI1: - { - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - - Gfx test = {gsSP1Triangle(aa, bb, cc, 0)}; - word0 = test.words.w0; - word1 = test.words.w1; - } - break; - case G_TRI2: - { - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - int32_t dd = ((data & 0x00000000FF0000ULL) >> 16) / 2; - int32_t ee = ((data & 0x0000000000FF00ULL) >> 8) / 2; - int32_t ff = ((data & 0x000000000000FFULL) >> 0) / 2; - - Gfx test = {gsSP2Triangles(aa, bb, cc, 0, dd, ee, ff, 0)}; - word0 = test.words.w0; - word1 = test.words.w1; - } - break; - case G_QUAD: - { - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - int32_t dd = ((data & 0x000000000000FFULL)) / 2; - - Gfx test = {gsSP1Quadrangle(aa, bb, cc, dd, 0)}; - word0 = test.words.w0; - word1 = test.words.w1; - } - break; - case G_SETPRIMCOLOR: - { - int32_t mm = (data & 0x0000FF0000000000) >> 40; - int32_t ff = (data & 0x000000FF00000000) >> 32; - int32_t rr = (data & 0x00000000FF000000) >> 24; - int32_t gg = (data & 0x0000000000FF0000) >> 16; - int32_t bb = (data & 0x000000000000FF00) >> 8; - int32_t aa = (data & 0x00000000000000FF) >> 0; - - Gfx value = {gsDPSetPrimColor(mm, ff, rr, gg, bb, aa)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETOTHERMODE_L: - { - int32_t ss = (data & 0x0000FF0000000000) >> 40; - int32_t len = ((data & 0x000000FF00000000) >> 32) + 1; - int32_t sft = 32 - (len)-ss; - int32_t dd = (data & 0xFFFFFFFF); - - // TODO: Output the correct render modes in data - - Gfx value = {gsSPSetOtherMode(0xE2, sft, len, dd)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETOTHERMODE_H: - { - int32_t ss = (data & 0x0000FF0000000000) >> 40; - int32_t nn = (data & 0x000000FF00000000) >> 32; - int32_t dd = (data & 0xFFFFFFFF); - - int32_t sft = 32 - (nn + 1) - ss; - - Gfx value; - - if (sft == 14) // G_MDSFT_TEXTLUT - { - const char* types[] = { "G_TT_NONE", "G_TT_NONE", "G_TT_RGBA16", "G_TT_IA16" }; - value = {gsDPSetTextureLUT(dd >> 14)}; - } - else - { - value = {gsSPSetOtherMode(0xE3, sft, nn + 1, dd)}; - } - - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETTILE: - { - int32_t fff = (data & 0b0000000011100000000000000000000000000000000000000000000000000000) >> 53; - int32_t ii = (data & 0b0000000000011000000000000000000000000000000000000000000000000000) >> 51; - int32_t nnnnnnnnn = - (data & 0b0000000000000011111111100000000000000000000000000000000000000000) >> 41; - int32_t mmmmmmmmm = - (data & 0b0000000000000000000000011111111100000000000000000000000000000000) >> 32; - int32_t ttt = (data & 0b0000000000000000000000000000000000000111000000000000000000000000) >> 24; - int32_t pppp = - (data & 0b0000000000000000000000000000000000000000111100000000000000000000) >> 20; - int32_t cc = (data & 0b0000000000000000000000000000000000000000000011000000000000000000) >> 18; - int32_t aaaa = - (data & 0b0000000000000000000000000000000000000000000000111100000000000000) >> 14; - int32_t ssss = - (data & 0b0000000000000000000000000000000000000000000000000011110000000000) >> 10; - int32_t dd = (data & 0b0000000000000000000000000000000000000000000000000000001100000000) >> 8; - int32_t bbbb = (data & 0b0000000000000000000000000000000000000000000000000000000011110000) >> 4; - int32_t uuuu = (data & 0b0000000000000000000000000000000000000000000000000000000000001111); - - Gfx value = {gsDPSetTile(fff, ii, nnnnnnnnn, mmmmmmmmm, ttt, pppp, cc, aaaa, ssss, dd, bbbb, uuuu)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETCOMBINE: - { - int32_t a0 = (data & 0b000000011110000000000000000000000000000000000000000000000000000) >> 52; - int32_t c0 = (data & 0b000000000001111100000000000000000000000000000000000000000000000) >> 47; - int32_t aa0 = (data & 0b00000000000000011100000000000000000000000000000000000000000000) >> 44; - int32_t ac0 = (data & 0b00000000000000000011100000000000000000000000000000000000000000) >> 41; - int32_t a1 = (data & 0b000000000000000000000011110000000000000000000000000000000000000) >> 37; - int32_t c1 = (data & 0b000000000000000000000000001111100000000000000000000000000000000) >> 32; - int32_t b0 = (data & 0b000000000000000000000000000000011110000000000000000000000000000) >> 28; - int32_t b1 = (data & 0b000000000000000000000000000000000001111000000000000000000000000) >> 24; - int32_t aa1 = (data & 0b00000000000000000000000000000000000000111000000000000000000000) >> 21; - int32_t ac1 = (data & 0b00000000000000000000000000000000000000000111000000000000000000) >> 18; - int32_t d0 = (data & 0b000000000000000000000000000000000000000000000111000000000000000) >> 15; - int32_t ab0 = (data & 0b00000000000000000000000000000000000000000000000111000000000000) >> 12; - int32_t ad0 = (data & 0b00000000000000000000000000000000000000000000000000111000000000) >> 9; - int32_t d1 = (data & 0b000000000000000000000000000000000000000000000000000000111000000) >> 6; - int32_t ab1 = (data & 0b00000000000000000000000000000000000000000000000000000000111000) >> 3; - int32_t ad1 = (data & 0b00000000000000000000000000000000000000000000000000000000000111) >> 0; - - Gfx value = { gsDPSetCombineLERP_NoMacros(a0, b0, c0, d0, aa0, ab0, ac0, ad0, a1, b1, c1, d1, aa1, ab1, ac1, ad1)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETTILESIZE: - { - int32_t sss = (data & 0x00FFF00000000000) >> 44; - int32_t ttt = (data & 0x00000FFF00000000) >> 32; - int32_t uuu = (data & 0x0000000000FFF000) >> 12; - int32_t vvv = (data & 0x0000000000000FFF); - int32_t i = (data & 0x000000000F000000) >> 24; - - Gfx value = {gsDPSetTileSize(i, sss, ttt, uuu, vvv)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_LOADTLUT: - { - int32_t t = (data & 0x0000000007000000) >> 24; - int32_t ccc = (data & 0x00000000003FF000) >> 14; - - Gfx value = {gsDPLoadTLUTCmd(t, ccc)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_LOADTILE: - { - int sss = (data & 0x00FFF00000000000) >> 44; - int ttt = (data & 0x00000FFF00000000) >> 32; - int i = (data & 0x000000000F000000) >> 24; - int uuu = (data & 0x0000000000FFF000) >> 12; - int vvv= (data & 0x0000000000000FFF); - - Gfx value = {gsDPLoadTile(i, sss, ttt, uuu, vvv)}; - word0 = value.words.w0; - word1 = value.words.w1; - } - break; - case G_SETTIMG: - { - uint32_t seg = data & 0xFFFFFFFF; - int32_t texAddress = Seg2Filespace(data, dList->parent->baseAddress); - - if (!Globals::Instance->HasSegment(GETSEGNUM(seg), res->parent->workerID) || (res->GetName() == "sShadowMaterialDL")) - { - if (res->GetName() == "sShadowMaterialDL") { - // sShadowMaterialDL (In ovl_En_Jsjutan) has a texture in bss. This is a hack to override the reference to one - // to segment C. The actor has been modified to load the texture into segment C. - seg = 0x0C000000; - } - int32_t __ = (data & 0x00FF000000000000) >> 48; - int32_t www = (data & 0x00000FFF00000000) >> 32; - - uint32_t fmt = (__ & 0xE0) >> 5; - uint32_t siz = (__ & 0x18) >> 3; - - Gfx value = {gsDPSetTextureImage(fmt, siz, www + 1, (seg & 0x0FFFFFFF) + 1)}; - word0 = value.words.w0; - word1 = value.words.w1; - - writer->Write(word0); - writer->Write(word1); - } - else - { - std::string texName = ""; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, dList->parent, "", texName, res->parent->workerID); - - int32_t __ = (data & 0x00FF000000000000) >> 48; - int32_t www = (data & 0x00000FFF00000000) >> 32; - - uint32_t fmt = (__ & 0xE0) >> 5; - uint32_t siz = (__ & 0x18) >> 3; - - Gfx value = {gsDPSetTextureImage(fmt, siz, www + 1, __)}; - word0 = value.words.w0 & 0x00FFFFFF; - word0 += (G_SETTIMG_OTR_HASH << 24); - //word1 = value.words.w1; - word1 = 0; - - writer->Write(word0); - writer->Write(word1); - - if (foundDecl) - { - ZFile* assocFile = Globals::Instance->GetSegment(GETSEGNUM(seg), res->parent->workerID); - std::string assocFileName = assocFile->GetName(); - std::string fName = ""; - - if (GETSEGNUM(seg) == SEGMENT_SCENE || GETSEGNUM(seg) == SEGMENT_ROOM) - fName = GetPathToRes(res, texName.c_str()); - else - fName = GetPathToRes(assocFile->resources[0], texName.c_str()); - - uint64_t hash = CRC64(fName.c_str()); - - word0 = hash >> 32; - word1 = hash & 0xFFFFFFFF; - } - else - { - word0 = 0; - word1 = 0; - spdlog::error("texDecl == nullptr! PTR = 0x{:08X}", texAddress); - } - } - } - break; - case G_VTX: - { - if (GETSEGNUM(data) == 0xC || GETSEGNUM(data) == 0x8) - { - // hack for dynamic verticies used in en_ganon_mant and en_jsjutan - // TODO is there a better way? - int32_t aa = (data & 0x000000FF00000000ULL) >> 32; - int32_t nn = (data & 0x000FF00000000000ULL) >> 44; - - Gfx value = {gsSPVertex(data & 0xFFFFFFFF, nn, ((aa >> 1) - nn))}; - - word0 = value.words.w0; - word1 = value.words.w1 | 1; - } - else - { - // Write CRC64 of vtx file name - uint32_t addr = data & 0xFFFFFFFF; - - if (GETSEGNUM(data) == 0x80) - addr -= dList->parent->baseAddress; - - auto segOffset = GETSEGOFFSET(addr); - Declaration* vtxDecl = dList->parent->GetDeclarationRanged(segOffset); - - int32_t aa = (data & 0x000000FF00000000ULL) >> 32; - int32_t nn = (data & 0x000FF00000000000ULL) >> 44; - - if (vtxDecl != nullptr && vtxDecl->varType != "Gfx") - { - uint32_t diff = segOffset - vtxDecl->address; - - Gfx value = {gsSPVertex(diff, nn, ((aa >> 1) - nn))}; - - word0 = value.words.w0; - word0 &= 0x00FFFFFF; - word0 += (G_VTX_OTR_HASH << 24); - word1 = value.words.w1; - - writer->Write(word0); - writer->Write(word1); - - std::string fName = OTRExporter_DisplayList::GetPathToRes(res, vtxDecl->varName); - - uint64_t hash = CRC64(fName.c_str()); - - word0 = hash >> 32; - word1 = hash & 0xFFFFFFFF; - - if (files.find(fName) == files.end() && !DiskFile::Exists("Extract/" + fName)) - { - // Write vertices to file - MemoryStream* vtxStream = new MemoryStream(); - BinaryWriter vtxWriter = BinaryWriter(vtxStream); - - int arrCnt = 0; - - auto split = StringHelper::Split(vtxDecl->text, "\n"); - - for (size_t i = 0; i < split.size(); i++) - { - std::string line = split[i]; - - if (StringHelper::Contains(line, "VTX(")) - arrCnt++; - } - - // OTRTODO: Once we aren't relying on text representations, we should call ArrayExporter... - OTRExporter::WriteHeader(nullptr, "", &vtxWriter, LUS::ResourceType::Array); - - vtxWriter.Write((uint32_t)ZResourceType::Vertex); - vtxWriter.Write((uint32_t)arrCnt); - - auto start = std::chrono::steady_clock::now(); - - // God dammit this is so dumb - for (size_t i = 0; i < split.size(); i++) - { - std::string line = split[i]; - - if (StringHelper::Contains(line, "VTX(")) - { - auto split2 = StringHelper::Split(StringHelper::Split(StringHelper::Split(line, "VTX(")[1], ")")[0], ","); - - vtxWriter.Write((int16_t)std::stoi(split2[0], nullptr, 10)); // v.x - vtxWriter.Write((int16_t)std::stoi(split2[1], nullptr, 10)); // v.y - vtxWriter.Write((int16_t)std::stoi(split2[2], nullptr, 10)); // v.z - - vtxWriter.Write((int16_t)0); // v.flag - - vtxWriter.Write((int16_t)std::stoi(split2[3], nullptr, 10)); // v.s - vtxWriter.Write((int16_t)std::stoi(split2[4], nullptr, 10)); // v.t - - vtxWriter.Write((uint8_t)std::stoi(split2[5], nullptr, 10)); // v.r - vtxWriter.Write((uint8_t)std::stoi(split2[6], nullptr, 10)); // v.g - vtxWriter.Write((uint8_t)std::stoi(split2[7], nullptr, 10)); // v.b - vtxWriter.Write((uint8_t)std::stoi(split2[8], nullptr, 10)); // v.a - } - } - - AddFile(fName, vtxStream->ToVector()); - - auto end = std::chrono::steady_clock::now(); - size_t diff = std::chrono::duration_cast(end - start).count(); - } - } - else - { - spdlog::error("vtxDecl == nullptr!"); - } - } - } - break; - } - - writer->Write(word0); - writer->Write(word1); - } - - auto dlEnd = std::chrono::steady_clock::now(); - size_t dlDiff = std::chrono::duration_cast(dlEnd - dlStart).count(); - - //printf("Display List Gen in %zums\n", dlDiff); -} - -std::string OTRExporter_DisplayList::GetPathToRes(ZResource* res, std::string varName) -{ - std::string prefix = GetPrefix(res); - std::string fName = StringHelper::Sprintf("%s/%s", GetParentFolderName(res).c_str(), varName.c_str()); - - return fName; -} - -std::string OTRExporter_DisplayList::GetParentFolderName(ZResource* res) -{ - std::string prefix = GetPrefix(res); - std::string oName = res->parent->GetOutName(); - - if (StringHelper::Contains(oName, "_scene")) - { - auto split = StringHelper::Split(oName, "_"); - oName = ""; - for (size_t i = 0; i < split.size() - 1; i++) - oName += split[i] + "_"; - - oName += "scene"; - } - else if (StringHelper::Contains(oName, "_room")) - { - oName = StringHelper::Split(oName, "_room")[0] + "_scene"; - } - - if (prefix != "") - oName = prefix + "/" + oName; - - return oName; -} - -std::string OTRExporter_DisplayList::GetPrefix(ZResource* res) -{ - std::string oName = res->parent->GetOutName(); - std::string prefix = ""; - std::string xmlPath = StringHelper::Replace(res->parent->GetXmlFilePath().string(), "\\", "/"); - - if (StringHelper::Contains(oName, "_scene") || StringHelper::Contains(oName, "_room")) { - prefix = "scenes"; - if (Globals::Instance->rom->IsMQ()) { - prefix += "/mq"; - } else { - prefix += "/nonmq"; - } - } - else if (StringHelper::Contains(xmlPath, "objects/")) - prefix = "objects"; - else if (StringHelper::Contains(xmlPath, "textures/")) - prefix = "textures"; - else if (StringHelper::Contains(xmlPath, "overlays/")) - prefix = "overlays"; - else if (StringHelper::Contains(xmlPath, "misc/")) - prefix = "misc"; - else if (StringHelper::Contains(xmlPath, "text/")) - prefix = "text"; - else if (StringHelper::Contains(xmlPath, "code/")) - prefix = "code"; - - return prefix; -} diff --git a/OTRExporter/OTRExporter/DisplayListExporter.h b/OTRExporter/OTRExporter/DisplayListExporter.h deleted file mode 100644 index d8d96971c..000000000 --- a/OTRExporter/OTRExporter/DisplayListExporter.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "ZDisplayList.h" -#include "Exporter.h" -#include - -class OTRExporter_DisplayList : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; - static std::string GetParentFolderName(ZResource* res); - static std::string GetPathToRes(ZResource* res, std::string varName); - static std::string GetPrefix(ZResource* res); - -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/Exporter.cpp b/OTRExporter/OTRExporter/Exporter.cpp deleted file mode 100644 index a523bb16c..000000000 --- a/OTRExporter/OTRExporter/Exporter.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "Exporter.h" -#include "VersionInfo.h" - -void OTRExporter::WriteHeader(ZResource* res, const fs::path& outPath, BinaryWriter* writer, LUS::ResourceType resType, int32_t resVersion) -{ - writer->Write((uint8_t)Endianness::Little); // 0x00 - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write((uint32_t)resType); // 0x04 - //writer->Write((uint32_t)MAJOR_VERSION); // 0x08 - writer->Write((uint32_t)resVersion); // 0x08 - writer->Write((uint64_t)0xDEADBEEFDEADBEEF); // id, 0x0C - writer->Write((uint32_t)resourceVersions[resType]); // 0x10 - writer->Write((uint64_t)0); // ROM CRC, 0x14 - writer->Write((uint32_t)0); // ROM Enum, 0x1C - - while (writer->GetBaseAddress() < 0x40) - writer->Write((uint32_t)0); // To be used at a later date! -} diff --git a/OTRExporter/OTRExporter/Exporter.h b/OTRExporter/OTRExporter/Exporter.h deleted file mode 100644 index cd4ed9adb..000000000 --- a/OTRExporter/OTRExporter/Exporter.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once -#include "ZResource.h" -#include "ZArray.h" -#include "stdint.h" -//#include "OTRExporter.h" -#include -#include -#include "VersionInfo.h" - -class OTRExporter : public ZResourceExporter -{ -protected: - static void WriteHeader(ZResource* res, const fs::path& outPath, BinaryWriter* writer, LUS::ResourceType resType, int32_t resVersion = 0); -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/Main.cpp b/OTRExporter/OTRExporter/Main.cpp deleted file mode 100644 index 506f8bfd4..000000000 --- a/OTRExporter/OTRExporter/Main.cpp +++ /dev/null @@ -1,329 +0,0 @@ -#include "Main.h" -#include "Exporter.h" -#include "BackgroundExporter.h" -#include "TextureExporter.h" -#include "RoomExporter.h" -#include "CollisionExporter.h" -#include "DisplayListExporter.h" -#include "PlayerAnimationExporter.h" -#include "SkeletonExporter.h" -#include "SkeletonLimbExporter.h" -#include "ArrayExporter.h" -#include "VtxExporter.h" -#include "AnimationExporter.h" -#include "CutsceneExporter.h" -#include "PathExporter.h" -#include "TextExporter.h" -#include "BlobExporter.h" -#include "MtxExporter.h" -#include "AudioExporter.h" -#include -#include -#include -#include -#include -#include -#include -#include - -std::string otrFileName = "oot.otr"; -std::shared_ptr otrArchive; -BinaryWriter* fileWriter; -std::chrono::steady_clock::time_point fileStart, resStart; -std::map> files; -std::mutex fileMutex; - -void InitVersionInfo(); - -enum class ExporterFileMode -{ - BuildOTR = (int)ZFileMode::Custom + 1, -}; - -static void ExporterParseFileMode(const std::string& buildMode, ZFileMode& fileMode) -{ - if (buildMode == "botr") - { - fileMode = (ZFileMode)ExporterFileMode::BuildOTR; - - printf("BOTR: Generating OTR Archive...\n"); - - if (DiskFile::Exists(otrFileName)) - otrArchive = std::shared_ptr(new LUS::Archive(otrFileName, true)); - else - otrArchive = LUS::Archive::CreateArchive(otrFileName, 40000); - - auto lst = Directory::ListFiles("Extract"); - - for (auto item : lst) - { - auto fileData = DiskFile::ReadAllBytes(item); - otrArchive->AddFile(StringHelper::Split(item, "Extract/")[1], (uintptr_t)fileData.data(), fileData.size()); - } - } -} - -static void ExporterProgramEnd() -{ - uint32_t crc = 0xFFFFFFFF; - const uint8_t endianness = (uint8_t)Endianness::Big; - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - { - std::string romPath = Globals::Instance->baseRomPath.string(); - std::vector romData = DiskFile::ReadAllBytes(romPath); - - BitConverter::RomToBigEndian(romData.data(), romData.size()); - - crc = BitConverter::ToUInt32BE(romData, 0x10); - printf("Creating version file...\n"); - - // Get crc from rom - - MemoryStream *versionStream = new MemoryStream(); - BinaryWriter writer(versionStream); - writer.SetEndianness(Endianness::Big); - writer.Write(endianness); - writer.Write(crc); - writer.Close(); - - printf("Created version file.\n"); - - printf("Generating OTR Archive...\n"); - otrArchive = LUS::Archive::CreateArchive(otrFileName, 40000); - - otrArchive->AddFile("version", (uintptr_t)versionStream->ToVector().data(), versionStream->GetLength()); - - for (const auto& item : files) - { - std::string fName = item.first; - if (fName.find("gTitleZeldaShieldLogoMQTex") != std::string::npos && !ZRom(romPath).IsMQ()) - { - size_t pos = 0; - if ((pos = fName.find("gTitleZeldaShieldLogoMQTex", 0)) != std::string::npos) - { - fName.replace(pos, 27, "gTitleZeldaShieldLogoTex"); - } - } - const auto& fileData = item.second; - otrArchive->AddFile(fName, (uintptr_t)fileData.data(), - fileData.size()); - } - } - otrArchive = nullptr; - delete fileWriter; - files.clear(); - - // Add any additional files that need to be manually copied... - if (DiskFile::Exists("soh.otr")) { - return; - } - const auto& lst = Directory::ListFiles("Extract"); - std::shared_ptr sohOtr = LUS::Archive::CreateArchive("soh.otr", 4096); - //sohOtr->AddFile("version", (uintptr_t)versionStream->ToVector().data(), versionStream->GetLength()); - - for (const auto& item : lst) - { - std::vector splitPath = StringHelper::Split(item, "."); - - if (splitPath.size() >= 3) - { - const std::string extension = splitPath.at(splitPath.size() - 1); - const std::string format = splitPath.at(splitPath.size() - 2); - splitPath.pop_back(); - splitPath.pop_back(); - std::string afterPath = std::accumulate(splitPath.begin(), splitPath.end(), std::string("")); - if (extension == "png" && (format == "rgba32" || format == "rgb5a1" || format == "i4" || format == "i8" || format == "ia4" || format == "ia8" || format == "ia16" || format == "ci4" || format == "ci8")) - { - ZTexture tex(nullptr); - Globals::Instance->buildRawTexture = true; - tex.FromPNG(item, ZTexture::GetTextureTypeFromString(format)); - printf("sohOtr->AddFile(%s)\n", StringHelper::Split(afterPath, "Extract/")[1].c_str()); - - OTRExporter_Texture exporter; - - MemoryStream* stream = new MemoryStream(); - BinaryWriter writer(stream); - - exporter.Save(&tex, "", &writer); - - std::string src = tex.GetBodySourceCode(); - writer.Write((char *)src.c_str(), src.size()); - - std::vector fileData = stream->ToVector(); - sohOtr->AddFile(StringHelper::Split(afterPath, "Extract/assets/")[1], (uintptr_t)fileData.data(), fileData.size()); - continue; - } - } - - if (item.find("accessibility") != std::string::npos) - { - std::string extension = splitPath.at(splitPath.size() - 1); - splitPath.pop_back(); - if (extension == "json") - { - const auto &fileData = DiskFile::ReadAllBytes(item); - printf("Adding accessibility texts %s\n", StringHelper::Split(item, "texts/")[1].c_str()); - sohOtr->AddFile(StringHelper::Split(item, "Extract/assets/")[1], (uintptr_t)fileData.data(), fileData.size()); - } - continue; - } - - const auto& fileData = DiskFile::ReadAllBytes(item); - printf("sohOtr->AddFile(%s)\n", StringHelper::Split(item, "Extract/")[1].c_str()); - sohOtr->AddFile(StringHelper::Split(item, item.find("Extract/assets/") != std::string::npos ? "Extract/assets/" : "Extract/")[1], (uintptr_t)fileData.data(), fileData.size()); - } - sohOtr = nullptr; -} - -static void ExporterParseArgs(int argc, char* argv[], int& i) -{ - std::string arg = argv[i]; - - if (arg == "--otrfile") - { - otrFileName = argv[i + 1]; - i++; - } -} - -static bool ExporterProcessFileMode(ZFileMode fileMode) -{ - // Do whatever work is associated with these custom file modes... - // Return true to indicate one of our own file modes is being processed - if (fileMode == (ZFileMode)ExporterFileMode::BuildOTR) - return true; - - return false; -} - -static void ExporterFileBegin(ZFile* file) -{ - fileStart = std::chrono::steady_clock::now(); - - MemoryStream* stream = new MemoryStream(); - fileWriter = new BinaryWriter(stream); -} - -static void ExporterFileEnd(ZFile* file) -{ - // delete fileWriter; -} - -static void ExporterResourceEnd(ZResource* res, BinaryWriter& writer) -{ - auto streamShared = writer.GetStream(); - MemoryStream* strem = (MemoryStream*)streamShared.get(); - - auto start = std::chrono::steady_clock::now(); - - if (res->GetName() != "") - { - std::string oName = res->parent->GetOutName(); - std::string rName = res->GetName(); - std::string prefix = OTRExporter_DisplayList::GetPrefix(res); - - //auto xmlFilePath = res->parent->GetXmlFilePath(); - //prefix = StringHelper::Split(StringHelper::Split(xmlFilePath.string(), "xml\\")[1], ".xml")[0]; - - if (StringHelper::Contains(oName, "_scene")) - { - auto split = StringHelper::Split(oName, "_"); - oName = ""; - for (size_t i = 0; i < split.size() - 1; i++) - oName += split[i] + "_"; - - oName += "scene"; - } - else if (StringHelper::Contains(oName, "_room")) - { - oName = StringHelper::Split(oName, "_room")[0] + "_scene"; - } - - std::string fName = ""; - - if (prefix != "") - fName = StringHelper::Sprintf("%s/%s/%s", prefix.c_str(), oName.c_str(), rName.c_str()); - else - fName = StringHelper::Sprintf("%s/%s", oName.c_str(), rName.c_str()); - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - { - std::unique_lock Lock(fileMutex); - files[fName] = strem->ToVector(); - } - else - DiskFile::WriteAllBytes("Extract/" + fName, strem->ToVector()); - } - - auto end = std::chrono::steady_clock::now(); - size_t diff = std::chrono::duration_cast(end - start).count(); - - //if (diff > 10) - //printf("Exported Resource End %s in %zums\n", res->GetName().c_str(), diff); -} - -static void ExporterProcessCompilable(tinyxml2::XMLElement* reader) -{ - std::string nodeName = reader->Name(); -} - -static void ExporterXMLBegin() -{ -} - -static void ExporterXMLEnd() -{ -} - -void AddFile(std::string fName, std::vector data) -{ - if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory) - DiskFile::WriteAllBytes("Extract/" + fName, data); - else - { - std::unique_lock Lock(fileMutex); - files[fName] = data; - } -} - -void ImportExporters() -{ - // In this example we set up a new exporter called "EXAMPLE". - // By running ZAPD with the argument -se EXAMPLE, we tell it that we want to use this exporter for our resources. - ExporterSet* exporterSet = new ExporterSet(); - exporterSet->processFileModeFunc = ExporterProcessFileMode; - exporterSet->parseFileModeFunc = ExporterParseFileMode; - exporterSet->processCompilableFunc = ExporterProcessCompilable; - exporterSet->parseArgsFunc = ExporterParseArgs; - exporterSet->beginFileFunc = ExporterFileBegin; - exporterSet->endFileFunc = ExporterFileEnd; - exporterSet->beginXMLFunc = ExporterXMLBegin; - exporterSet->endXMLFunc = ExporterXMLEnd; - exporterSet->resSaveFunc = ExporterResourceEnd; - exporterSet->endProgramFunc = ExporterProgramEnd; - - exporterSet->exporters[ZResourceType::Background] = new OTRExporter_Background(); - exporterSet->exporters[ZResourceType::Texture] = new OTRExporter_Texture(); - exporterSet->exporters[ZResourceType::Room] = new OTRExporter_Room(); - exporterSet->exporters[ZResourceType::AltHeader] = new OTRExporter_Room(); - exporterSet->exporters[ZResourceType::Scene] = new OTRExporter_Room(); - exporterSet->exporters[ZResourceType::CollisionHeader] = new OTRExporter_Collision(); - exporterSet->exporters[ZResourceType::DisplayList] = new OTRExporter_DisplayList(); - exporterSet->exporters[ZResourceType::PlayerAnimationData] = new OTRExporter_PlayerAnimationExporter(); - exporterSet->exporters[ZResourceType::Skeleton] = new OTRExporter_Skeleton(); - exporterSet->exporters[ZResourceType::Limb] = new OTRExporter_SkeletonLimb(); - exporterSet->exporters[ZResourceType::Animation] = new OTRExporter_Animation(); - exporterSet->exporters[ZResourceType::Cutscene] = new OTRExporter_Cutscene(); - exporterSet->exporters[ZResourceType::Vertex] = new OTRExporter_Vtx(); - exporterSet->exporters[ZResourceType::Array] = new OTRExporter_Array(); - exporterSet->exporters[ZResourceType::Path] = new OTRExporter_Path(); - exporterSet->exporters[ZResourceType::Text] = new OTRExporter_Text(); - exporterSet->exporters[ZResourceType::Blob] = new OTRExporter_Blob(); - exporterSet->exporters[ZResourceType::Mtx] = new OTRExporter_MtxExporter(); - exporterSet->exporters[ZResourceType::Audio] = new OTRExporter_Audio(); - - Globals::AddExporter("OTR", exporterSet); - - InitVersionInfo(); -} diff --git a/OTRExporter/OTRExporter/Main.h b/OTRExporter/OTRExporter/Main.h deleted file mode 100644 index 3aa68c7e1..000000000 --- a/OTRExporter/OTRExporter/Main.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#include - -extern std::shared_ptr otrArchive; -extern std::map> files; - -void AddFile(std::string fName, std::vector data); \ No newline at end of file diff --git a/OTRExporter/OTRExporter/MtxExporter.cpp b/OTRExporter/OTRExporter/MtxExporter.cpp deleted file mode 100644 index 129e43aeb..000000000 --- a/OTRExporter/OTRExporter/MtxExporter.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "MtxExporter.h" - -void OTRExporter_MtxExporter::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZMtx* mtx = (ZMtx*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::Matrix); - - for (size_t i = 0; i < 4; i++) - for (size_t j = 0; j < 4; j++) - //TODO possibly utilize the array class better - writer->Write(mtx->mtx[i][j]); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/MtxExporter.h b/OTRExporter/OTRExporter/MtxExporter.h deleted file mode 100644 index 895f2a40e..000000000 --- a/OTRExporter/OTRExporter/MtxExporter.h +++ /dev/null @@ -1,10 +0,0 @@ -#include "ZResource.h" -#include "ZMtx.h" -#include "Exporter.h" -#include - -class OTRExporter_MtxExporter : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; diff --git a/OTRExporter/OTRExporter/PathExporter.cpp b/OTRExporter/OTRExporter/PathExporter.cpp deleted file mode 100644 index cc507c7aa..000000000 --- a/OTRExporter/OTRExporter/PathExporter.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "PathExporter.h" -#include "../ZAPD/ZFile.h" - -void OTRExporter_Path::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZPath* path = (ZPath*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Path); - - writer->Write((uint32_t)path->pathways.size()); - - for (size_t k = 0; k < path->pathways.size(); k++) - { - writer->Write((uint32_t)path->pathways[k].points.size()); - - for (size_t i = 0; i < path->pathways[k].points.size(); i++) - { - writer->Write(path->pathways[k].points[i].scalars[0].scalarData.s16); - writer->Write(path->pathways[k].points[i].scalars[1].scalarData.s16); - writer->Write(path->pathways[k].points[i].scalars[2].scalarData.s16); - } - } -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/PathExporter.h b/OTRExporter/OTRExporter/PathExporter.h deleted file mode 100644 index 9614b84df..000000000 --- a/OTRExporter/OTRExporter/PathExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZPath.h" -#include "Exporter.h" -#include - -class OTRExporter_Path : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/PlayerAnimationExporter.cpp b/OTRExporter/OTRExporter/PlayerAnimationExporter.cpp deleted file mode 100644 index b735c4e42..000000000 --- a/OTRExporter/OTRExporter/PlayerAnimationExporter.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "PlayerAnimationExporter.h" -#include - -void OTRExporter_PlayerAnimationExporter::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZPlayerAnimationData* anim = (ZPlayerAnimationData*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_PlayerAnimation); - - auto start = std::chrono::steady_clock::now(); - - writer->Write((uint32_t)anim->limbRotData.size()); - - for (size_t i = 0; i < anim->limbRotData.size(); i++) - writer->Write(anim->limbRotData[i]); - - auto end = std::chrono::steady_clock::now(); - size_t diff = std::chrono::duration_cast(end - start).count(); - - //printf("Exported Player Anim %s in %zums\n", anim->GetName().c_str(), diff); -} diff --git a/OTRExporter/OTRExporter/PlayerAnimationExporter.h b/OTRExporter/OTRExporter/PlayerAnimationExporter.h deleted file mode 100644 index 49e5468a2..000000000 --- a/OTRExporter/OTRExporter/PlayerAnimationExporter.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "ZPlayerAnimationData.h" -#include "Exporter.h" -#include - -class OTRExporter_PlayerAnimationExporter : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/RoomExporter.cpp b/OTRExporter/OTRExporter/RoomExporter.cpp deleted file mode 100644 index 3959d7639..000000000 --- a/OTRExporter/OTRExporter/RoomExporter.cpp +++ /dev/null @@ -1,521 +0,0 @@ -#include "RoomExporter.h" -#include "Utils/BinaryWriter.h" -#include "Utils/MemoryStream.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "CollisionExporter.h" -#include "DisplayListExporter.h" -#include -#include -#include -#include -#include "TextureExporter.h" -#include "Main.h" -#include -#include "CutsceneExporter.h" -#include -#include "PathExporter.h" -#undef FindResource - -void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZRoom* room = (ZRoom*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Room); - - writer->Write((uint32_t)room->commands.size()); - - for (size_t i = 0; i < room->commands.size(); i++) - { - ZRoomCommand* cmd = room->commands[i]; - - writer->Write((uint32_t)cmd->cmdID); - - switch (cmd->cmdID) - { - case RoomCommand::SetTransitionActorList: - { - SetTransitionActorList* cmdTrans = (SetTransitionActorList*)cmd; - - writer->Write((uint32_t)cmdTrans->transitionActors.size()); - - for (const TransitionActorEntry& entry : cmdTrans->transitionActors) - { - writer->Write(entry.frontObjectRoom); - writer->Write(entry.frontTransitionReaction); - writer->Write(entry.backObjectRoom); - writer->Write(entry.backTransitionReaction); - writer->Write(entry.actorNum); - writer->Write(entry.posX); - writer->Write(entry.posY); - writer->Write(entry.posZ); - writer->Write(entry.rotY); - writer->Write(entry.initVar); - } - } - break; - case RoomCommand::SetActorList: - { - SetActorList* cmdSetActorList = (SetActorList*)cmd; - - // There are instance of the amount of actors in the file differing from the size listed in the command. - // This can cause issues if we export actors with garbage data, so let's trust the command size - writer->Write((uint32_t)cmdSetActorList->numActors); - - for (const auto& entry : cmdSetActorList->actorList->actors) - { - writer->Write(entry.actorNum); - writer->Write(entry.posX); - writer->Write(entry.posY); - writer->Write(entry.posZ); - writer->Write(entry.rotX); - writer->Write(entry.rotY); - writer->Write(entry.rotZ); - writer->Write(entry.params); - } - } - break; - case RoomCommand::SetWind: - { - SetWind* cmdSetWind = (SetWind*)cmd; - - writer->Write(cmdSetWind->windWest); // 0x04 - writer->Write(cmdSetWind->windVertical); // 0x05 - writer->Write(cmdSetWind->windSouth); // 0x06 - writer->Write(cmdSetWind->clothFlappingStrength); // 0x07 - } - break; - case RoomCommand::SetTimeSettings: - { - SetTimeSettings* cmdTime = (SetTimeSettings*)cmd; - - writer->Write(cmdTime->hour); // 0x04 - writer->Write(cmdTime->min); // 0x05 - writer->Write(cmdTime->unk); // 0x06 - } - break; - case RoomCommand::SetSkyboxModifier: - { - SetSkyboxModifier* cmdSkybox = (SetSkyboxModifier*)cmd; - - writer->Write(cmdSkybox->disableSky); // 0x04 - writer->Write(cmdSkybox->disableSunMoon); // 0x05 - } - break; - case RoomCommand::SetEchoSettings: - { - SetEchoSettings* cmdEcho = (SetEchoSettings*)cmd; - - writer->Write((uint8_t)cmdEcho->echo); // 0x07 - } - break; - case RoomCommand::SetSoundSettings: - { - SetSoundSettings* cmdSound = (SetSoundSettings*)cmd; - - writer->Write((uint8_t)cmdSound->reverb); // 0x01 - - writer->Write(cmdSound->nightTimeSFX); // 0x06 - writer->Write(cmdSound->musicSequence); // 0x07 - } - break; - case RoomCommand::SetSkyboxSettings: - { - SetSkyboxSettings* cmdSkybox = (SetSkyboxSettings*)cmd; - - writer->Write((uint8_t)cmdSkybox->unk1); // 0x01 - writer->Write((uint8_t)cmdSkybox->skyboxNumber); // 0x04 - writer->Write((uint8_t)cmdSkybox->cloudsType); // 0x05 - writer->Write((uint8_t)cmdSkybox->isIndoors); // 0x06 - } - break; - case RoomCommand::SetRoomBehavior: - { - SetRoomBehavior* cmdRoom = (SetRoomBehavior*)cmd; - - writer->Write((uint8_t)cmdRoom->gameplayFlags); // 0x01 - writer->Write(cmdRoom->gameplayFlags2); // 0x04 - } - break; - case RoomCommand::SetCsCamera: - { - SetCsCamera* cmdCsCam = (SetCsCamera*)cmd; - - writer->Write((uint32_t)cmdCsCam->cameras.size()); - - for (size_t i = 0; i < cmdCsCam->cameras.size(); i++) - { - writer->Write(cmdCsCam->cameras[i].baseOffset); - writer->Write(cmdCsCam->cameras[i].type); - writer->Write(cmdCsCam->cameras[i].numPoints); - } - - writer->Write((uint32_t)cmdCsCam->points.size()); - - for (size_t i = 0; i < cmdCsCam->points.size(); i++) - { - writer->Write(cmdCsCam->points[i].scalars[0].scalarData.s16); - writer->Write(cmdCsCam->points[i].scalars[1].scalarData.s16); - writer->Write(cmdCsCam->points[i].scalars[2].scalarData.s16); - } - } - break; - case RoomCommand::SetMesh: - { - SetMesh* cmdMesh = (SetMesh*)cmd; - - writer->Write((uint8_t)cmdMesh->data); // 0x01 - writer->Write(cmdMesh->meshHeaderType); - - if (cmdMesh->meshHeaderType == 0 || cmdMesh->meshHeaderType == 2) - { - PolygonType2* poly = (PolygonType2*)cmdMesh->polyType.get(); - - writer->Write(poly->num); - - for (int i = 0; i < poly->num; i++) - WritePolyDList(writer, room, &poly->polyDLists[i]); - } - else if (cmdMesh->meshHeaderType == 1) - { - PolygonType1* poly = (PolygonType1*)cmdMesh->polyType.get(); - - writer->Write(poly->format); - - auto test = (PolygonDlist*)&poly->polyDLists[0]; - Declaration* dListDeclOpa = poly->parent->GetDeclaration(GETSEGOFFSET(test->opa)); - Declaration* dListDeclXlu = poly->parent->GetDeclaration(GETSEGOFFSET(test->xlu)); - - if (test->opa != 0) - writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclOpa->varName.c_str())); - else - writer->Write(""); - - if (test->xlu != 0) - writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclXlu->varName.c_str())); - else - writer->Write(""); - - if (poly->format == 2) - { - writer->Write((uint32_t)poly->count); - - for (int i = 0; i < poly->count; i++) - { - writer->Write(poly->multiList[i].unk_00); - writer->Write(poly->multiList[i].id); - - Declaration* bgDecl = poly->parent->GetDeclarationRanged(GETSEGOFFSET(poly->multiList[i].source)); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(poly->multiList[i].sourceBackground, bgDecl->varName)); - - writer->Write(poly->multiList[i].unk_0C); - writer->Write(poly->multiList[i].tlut); - writer->Write(poly->multiList[i].width); - writer->Write(poly->multiList[i].height); - writer->Write(poly->multiList[i].fmt); - writer->Write(poly->multiList[i].siz); - writer->Write(poly->multiList[i].mode0); - writer->Write(poly->multiList[i].tlutCount); - } - } - else - { - writer->Write((uint32_t)1); - - writer->Write(poly->single.unk_00); - writer->Write(poly->single.id); - - Declaration* bgDecl = poly->parent->GetDeclarationRanged(GETSEGOFFSET(poly->single.source)); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(poly->single.sourceBackground, bgDecl->varName)); - - writer->Write(poly->single.unk_0C); - writer->Write(poly->single.tlut); - writer->Write(poly->single.width); - writer->Write(poly->single.height); - writer->Write(poly->single.fmt); - writer->Write(poly->single.siz); - writer->Write(poly->single.mode0); - writer->Write(poly->single.tlutCount); - } - - if (poly->dlist != 0) - WritePolyDList(writer, room, &poly->polyDLists[0]); - } - } - break; - case RoomCommand::SetCameraSettings: - { - SetCameraSettings* cmdCam = (SetCameraSettings*)cmd; - - writer->Write((uint8_t)cmdCam->cameraMovement); // 0x01 - writer->Write(cmdCam->mapHighlight); // 0x04 - } - break; - case RoomCommand::SetLightList: - { - SetLightList* cmdLight = (SetLightList*)cmd; - - writer->Write((uint32_t)cmdLight->lights.size()); - - for (size_t i = 0; i < cmdLight->lights.size(); i++) - { - writer->Write(cmdLight->lights[i].type); - writer->Write(cmdLight->lights[i].x); - writer->Write(cmdLight->lights[i].y); - writer->Write(cmdLight->lights[i].z); - writer->Write(cmdLight->lights[i].r); - writer->Write(cmdLight->lights[i].g); - writer->Write(cmdLight->lights[i].b); - writer->Write(cmdLight->lights[i].drawGlow); - writer->Write(cmdLight->lights[i].radius); - } - } - break; - case RoomCommand::SetLightingSettings: - { - SetLightingSettings* cmdLight = (SetLightingSettings*)cmd; - - writer->Write((uint32_t)cmdLight->settings.size()); // 0x01 - - for (const LightingSettings& setting : cmdLight->settings) - { - writer->Write(setting.ambientClrR); - writer->Write(setting.ambientClrG); - writer->Write(setting.ambientClrB); - - writer->Write(setting.diffuseClrA_R); - writer->Write(setting.diffuseClrA_G); - writer->Write(setting.diffuseClrA_B); - - writer->Write(setting.diffuseDirA_X); - writer->Write(setting.diffuseDirA_Y); - writer->Write(setting.diffuseDirA_Z); - - writer->Write(setting.diffuseClrB_R); - writer->Write(setting.diffuseClrB_G); - writer->Write(setting.diffuseClrB_B); - - writer->Write(setting.diffuseDirB_X); - writer->Write(setting.diffuseDirB_Y); - writer->Write(setting.diffuseDirB_Z); - - writer->Write(setting.fogClrR); - writer->Write(setting.fogClrG); - writer->Write(setting.fogClrB); - - writer->Write(setting.unk); - writer->Write(setting.drawDistance); - } - } - break; - case RoomCommand::SetRoomList: - { - SetRoomList* cmdRoom = (SetRoomList*)cmd; - - writer->Write((uint32_t)cmdRoom->romfile->numRooms); // 0x01 - - for (size_t i = 0;i < cmdRoom->romfile->numRooms; i++) - { - //std::string roomName = StringHelper::Sprintf("%s/%s_room_%i", (StringHelper::Split(room->GetName(), "_")[0] + "_scene").c_str(), StringHelper::Split(room->GetName(), "_scene")[0].c_str(), i); - std::string roomName = OTRExporter_DisplayList::GetPathToRes(room, StringHelper::Sprintf("%s_room_%i", StringHelper::Split(room->GetName(), "_scene")[0].c_str(), i)); - writer->Write(roomName); - writer->Write(cmdRoom->romfile->rooms[i].virtualAddressStart); - writer->Write(cmdRoom->romfile->rooms[i].virtualAddressEnd); - } - } - break; - case RoomCommand::SetCollisionHeader: - { - SetCollisionHeader* cmdCollHeader = (SetCollisionHeader*)cmd; - - Declaration* colHeaderDecl = room->parent->GetDeclaration(cmdCollHeader->segmentOffset); - std::string path = OTRExporter_DisplayList::GetPathToRes(room, colHeaderDecl->varName); - writer->Write(path); - } - break; - case RoomCommand::SetEntranceList: - { - SetEntranceList* cmdEntrance = (SetEntranceList*)cmd; - - writer->Write((uint32_t)cmdEntrance->entrances.size()); - - for (EntranceEntry entry : cmdEntrance->entrances) - { - writer->Write((uint8_t)entry.startPositionIndex); - writer->Write((uint8_t)entry.roomToLoad); - } - } - break; - case RoomCommand::SetSpecialObjects: - { - SetSpecialObjects* cmdSpecObj = (SetSpecialObjects*)cmd; - - writer->Write((uint8_t)cmdSpecObj->elfMessage); // 0x01 - writer->Write((uint16_t)cmdSpecObj->globalObject); // 0x06 - } - break; - case RoomCommand::SetStartPositionList: - { - SetStartPositionList* cmdStartPos = (SetStartPositionList*)cmd; - - uint32_t baseStreamEnd = writer->GetStream().get()->GetLength(); - - writer->Write((uint32_t)cmdStartPos->actors.size()); // 0x01 - - for (const ActorSpawnEntry& entry : cmdStartPos->actors) - { - writer->Write(entry.actorNum); - writer->Write(entry.posX); - writer->Write(entry.posY); - writer->Write(entry.posZ); - writer->Write(entry.rotX); - writer->Write(entry.rotY); - writer->Write(entry.rotZ); - writer->Write(entry.params); - } - } - break; - case RoomCommand::SetAlternateHeaders: - { - SetAlternateHeaders* cmdHeaders = (SetAlternateHeaders*)cmd; - - writer->Write((uint32_t)cmdHeaders->headers.size()); - - for (size_t i = 0; i < cmdHeaders->headers.size(); i++) - { - uint32_t seg = cmdHeaders->headers[i] & 0xFFFFFFFF; - std::string headerName = ""; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(seg, room->parent, "", headerName, res->parent->workerID); - if (headerName == "NULL") - writer->Write(""); - else - { - std::string name = OTRExporter_DisplayList::GetPathToRes(room, headerName); - writer->Write(name); - } - } - } - break; - case RoomCommand::SetExitList: - { - SetExitList* cmdExit = (SetExitList*)cmd; - - writer->Write((uint32_t)cmdExit->exits.size()); - - for (size_t i = 0; i < cmdExit->exits.size(); i++) - writer->Write(cmdExit->exits[i]); - } - break; - case RoomCommand::SetObjectList: - { - SetObjectList* cmdSetObjectList = (SetObjectList*)cmd; - - writer->Write((uint32_t)cmdSetObjectList->objects.size()); - - for (size_t i = 0; i < cmdSetObjectList->objects.size(); i++) - writer->Write(cmdSetObjectList->objects[i]); - } - break; - case RoomCommand::SetCutscenes: - { - SetCutscenes* cmdSetCutscenes = (SetCutscenes*)cmd; - - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdSetCutscenes->cmdArg2, room->parent, "CutsceneData", listName, res->parent->workerID); - std::string fName = OTRExporter_DisplayList::GetPathToRes(room, listName); - //std::string fName = StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), listName.c_str()); - writer->Write(fName); - - MemoryStream* csStream = new MemoryStream(); - BinaryWriter csWriter = BinaryWriter(csStream); - OTRExporter_Cutscene cs; - cs.Save(cmdSetCutscenes->cutscenes[0], "", &csWriter); - - AddFile(fName, csStream->ToVector()); - } - break; - case RoomCommand::SetPathways: - { - SetPathways* cmdSetPathways = (SetPathways*)cmd; - - writer->Write((uint32_t)cmdSetPathways->pathwayList.pathways.size()); - - for (size_t i = 0; i < cmdSetPathways->pathwayList.pathways.size(); i++) - { - Declaration* decl = room->parent->GetDeclaration(GETSEGOFFSET(cmdSetPathways->pathwayList.pathways[i].listSegmentAddress)); - //std::string path = StringHelper::Sprintf("%s\\%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), decl->varName.c_str()); - std::string path = OTRExporter_DisplayList::GetPathToRes(room, decl->varName); - writer->Write(path); - - MemoryStream* pathStream = new MemoryStream(); - BinaryWriter pathWriter = BinaryWriter(pathStream); - OTRExporter_Path pathExp; - pathExp.Save(&cmdSetPathways->pathwayList, outPath, &pathWriter); - - AddFile(path, pathStream->ToVector()); - } - } - break; - case RoomCommand::EndMarker: - break; - default: - printf("UNIMPLEMENTED COMMAND: 0x%02X\n", (int)cmd->cmdID); - - break; - } - } -} - -void OTRExporter_Room::WritePolyDList(BinaryWriter* writer, ZRoom* room, PolygonDlist* dlist) -{ - writer->Write(dlist->polyType); - - switch (dlist->polyType) - { - case 2: - writer->Write(dlist->x); - writer->Write(dlist->y); - writer->Write(dlist->z); - writer->Write(dlist->unk_06); - [[fallthrough]]; - default: - //writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(res).c_str(), dListDeclOpa->varName.c_str())); - - if (dlist->opaDList != nullptr) - { - auto opaDecl = room->parent->GetDeclaration(GETSEGOFFSET(dlist->opaDList->GetRawDataIndex())); - writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), opaDecl->varName.c_str())); - } - else - writer->Write(""); - - if (dlist->xluDList != nullptr) - { - auto xluDecl = room->parent->GetDeclaration(GETSEGOFFSET(dlist->xluDList->GetRawDataIndex())); - writer->Write(StringHelper::Sprintf("%s/%s", OTRExporter_DisplayList::GetParentFolderName(room).c_str(), xluDecl->varName.c_str())); - } - else - writer->Write(""); - break; - } -} diff --git a/OTRExporter/OTRExporter/RoomExporter.h b/OTRExporter/OTRExporter/RoomExporter.h deleted file mode 100644 index f748658a5..000000000 --- a/OTRExporter/OTRExporter/RoomExporter.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "Exporter.h" -#include "ZRoom/ZRoom.h" - -class PolygonDlist; - -class OTRExporter_Room : public OTRExporter -{ -public: - void WritePolyDList(BinaryWriter* writer, ZRoom* room, PolygonDlist* dlist); - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/SkeletonExporter.cpp b/OTRExporter/OTRExporter/SkeletonExporter.cpp deleted file mode 100644 index fc4bba6fa..000000000 --- a/OTRExporter/OTRExporter/SkeletonExporter.cpp +++ /dev/null @@ -1,39 +0,0 @@ -#include "SkeletonExporter.h" -#include -#include -#include "DisplayListExporter.h" - -void OTRExporter_Skeleton::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZSkeleton* skel = (ZSkeleton*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_Skeleton); - - writer->Write((uint8_t)skel->type); - writer->Write((uint8_t)skel->limbType); - - writer->Write((uint32_t)skel->limbCount); - writer->Write((uint32_t)skel->dListCount); - - writer->Write((uint8_t)skel->limbsTable->limbType); - writer->Write((uint32_t)skel->limbsTable->count); - - for (size_t i = 0; i < skel->limbsTable->count; i++) - { - Declaration* skelDecl = skel->parent->GetDeclarationRanged(GETSEGOFFSET(skel->limbsTable->limbsAddresses[i])); - - std::string name; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(skel->limbsTable->limbsAddresses[i], skel->parent, "", name, res->parent->workerID); - if (foundDecl) - { - if (name.at(0) == '&') - name.erase(0, 1); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(res, name)); - } - else - { - writer->Write(""); - } - } -} diff --git a/OTRExporter/OTRExporter/SkeletonExporter.h b/OTRExporter/OTRExporter/SkeletonExporter.h deleted file mode 100644 index 36ffcf269..000000000 --- a/OTRExporter/OTRExporter/SkeletonExporter.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "ZDisplayList.h" -#include "ZSkeleton.h" -#include "Exporter.h" -#include - -class OTRExporter_Skeleton : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/SkeletonLimbExporter.cpp b/OTRExporter/OTRExporter/SkeletonLimbExporter.cpp deleted file mode 100644 index 1ee17c444..000000000 --- a/OTRExporter/OTRExporter/SkeletonLimbExporter.cpp +++ /dev/null @@ -1,176 +0,0 @@ -#include "SkeletonLimbExporter.h" -#include "DisplayListExporter.h" -#include -#include - -void OTRExporter_SkeletonLimb::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZLimb* limb = (ZLimb*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::SOH_SkeletonLimb); - - writer->Write((uint8_t)limb->type); - writer->Write((uint8_t)limb->skinSegmentType); - - if (limb->skinSegmentType == ZLimbSkinType::SkinType_DList && limb->type == ZLimbType::Skin) - { - auto childDecl = limb->parent->GetDeclaration(GETSEGOFFSET(limb->skinSegment)); - - if (childDecl != nullptr) - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, childDecl->varName)); - else - writer->Write(""); - } - else - { - writer->Write(""); - } - - writer->Write((uint16_t)limb->segmentStruct.unk_0); - writer->Write((uint32_t)limb->segmentStruct.unk_4_arr.size()); - - for (auto item : limb->segmentStruct.unk_4_arr) - { - writer->Write(item.unk_4); - - writer->Write((uint32_t)item.unk_8_arr.size()); - - for (auto item2 : item.unk_8_arr) - { - writer->Write(item2.unk_0); - writer->Write(item2.unk_2); - writer->Write(item2.unk_4); - writer->Write(item2.unk_6); - writer->Write(item2.unk_7); - writer->Write(item2.unk_8); - writer->Write(item2.unk_9); - } - - writer->Write((uint32_t)item.unk_C_arr.size()); - - for (auto item2 : item.unk_C_arr) - { - writer->Write(item2.unk_0); - writer->Write(item2.x); - writer->Write(item2.y); - writer->Write(item2.z); - writer->Write(item2.unk_8); - } - } - - if (limb->segmentStruct.unk_8 != 0) - { - auto skinGfxDecl = limb->parent->GetDeclaration(GETSEGOFFSET(limb->segmentStruct.unk_8)); - - if (skinGfxDecl != nullptr) - { - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, skinGfxDecl->varName)); - } - else - { - writer->Write(""); - } - } - else - { - writer->Write(""); - } - - writer->Write(limb->legTransX); - writer->Write(limb->legTransY); - writer->Write(limb->legTransZ); - writer->Write(limb->rotX); - writer->Write(limb->rotY); - writer->Write(limb->rotZ); - - if (limb->childPtr != 0) - { - std::string name; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->childPtr, limb->parent, "", name, res->parent->workerID); - if (foundDecl) - { - if (name.at(0) == '&') - name.erase(0, 1); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, name)); - } - else - { - writer->Write(""); - } - } - else - { - writer->Write(""); - } - - if (limb->siblingPtr != 0) - { - std::string name; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->siblingPtr, limb->parent, "", name, res->parent->workerID); - if (foundDecl) - { - if (name.at(0) == '&') - name.erase(0, 1); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, name)); - } - else - { - writer->Write(""); - } - } - else - { - writer->Write(""); - } - - if (limb->dListPtr != 0) - { - std::string name; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dListPtr, limb->parent, "", name, res->parent->workerID); - if (foundDecl) - { - if (name.at(0) == '&') - name.erase(0, 1); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, name)); - } - else - { - writer->Write(""); - } - } - else - { - writer->Write(""); - } - - if (limb->dList2Ptr != 0) - { - std::string name; - bool foundDecl = Globals::Instance->GetSegmentedPtrName(limb->dList2Ptr, limb->parent, "", name, res->parent->workerID); - if (foundDecl) - { - if (name.at(0) == '&') - name.erase(0, 1); - - writer->Write(OTRExporter_DisplayList::GetPathToRes(limb, name)); - } - else - { - writer->Write(""); - } - } - else - { - writer->Write(""); - } - - writer->Write(limb->transX); - writer->Write(limb->transY); - writer->Write(limb->transZ); - - writer->Write(limb->childIndex); - writer->Write(limb->siblingIndex); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/SkeletonLimbExporter.h b/OTRExporter/OTRExporter/SkeletonLimbExporter.h deleted file mode 100644 index 000827443..000000000 --- a/OTRExporter/OTRExporter/SkeletonLimbExporter.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "ZDisplayList.h" -#include "ZSkeleton.h" -#include "ZLimb.h" -#include "Exporter.h" -#include - -class OTRExporter_SkeletonLimb : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/TextExporter.cpp b/OTRExporter/OTRExporter/TextExporter.cpp deleted file mode 100644 index 2fcfe8251..000000000 --- a/OTRExporter/OTRExporter/TextExporter.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "TextExporter.h" -#include "../ZAPD/ZFile.h" - -void OTRExporter_Text::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZText* txt = (ZText*)res; - - WriteHeader(txt, outPath, writer, LUS::ResourceType::SOH_Text); - - writer->Write((uint32_t)txt->messages.size()); - - for (size_t i = 0; i < txt->messages.size(); i++) - { - writer->Write(txt->messages[i].id); - writer->Write(txt->messages[i].textboxType); - writer->Write(txt->messages[i].textboxYPos); - writer->Write(txt->messages[i].msg); - } -} diff --git a/OTRExporter/OTRExporter/TextExporter.h b/OTRExporter/OTRExporter/TextExporter.h deleted file mode 100644 index 2eaf2ce71..000000000 --- a/OTRExporter/OTRExporter/TextExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZText.h" -#include "Exporter.h" -#include - -class OTRExporter_Text : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/TextureExporter.cpp b/OTRExporter/OTRExporter/TextureExporter.cpp deleted file mode 100644 index 77cc20955..000000000 --- a/OTRExporter/OTRExporter/TextureExporter.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "TextureExporter.h" -#include "../ZAPD/ZFile.h" - -void OTRExporter_Texture::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZTexture* tex = (ZTexture*)res; - - WriteHeader(tex, outPath, writer, LUS::ResourceType::Texture); - - auto start = std::chrono::steady_clock::now(); - - //printf("Exporting Texture %s\n", tex->GetName().c_str()); - - writer->Write((uint32_t)tex->GetTextureType()); - writer->Write((uint32_t)tex->GetWidth()); - writer->Write((uint32_t)tex->GetHeight()); - - writer->Write((uint32_t)tex->GetRawDataSize()); - - if (tex->parent != nullptr) { - auto data = tex->parent->GetRawData(); - writer->Write((char*)data.data() + tex->GetRawDataIndex(), tex->GetRawDataSize()); - } - - auto end = std::chrono::steady_clock::now(); - size_t diff = std::chrono::duration_cast(end - start).count(); - - //printf("Exported Texture %s in %zums\n", tex->GetName().c_str(), diff); - - //if (diff > 2) - //printf("Export took %lms\n", diff); -} \ No newline at end of file diff --git a/OTRExporter/OTRExporter/TextureExporter.h b/OTRExporter/OTRExporter/TextureExporter.h deleted file mode 100644 index cdf7491a8..000000000 --- a/OTRExporter/OTRExporter/TextureExporter.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZTexture.h" -#include "Exporter.h" -#include - -class OTRExporter_Texture : public OTRExporter -{ -public: - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/VersionInfo.cpp b/OTRExporter/OTRExporter/VersionInfo.cpp deleted file mode 100644 index 50910bc31..000000000 --- a/OTRExporter/OTRExporter/VersionInfo.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "VersionInfo.h" -#include - -std::map resourceVersions; - -void InitVersionInfo() -{ - resourceVersions = std::map { - { LUS::ResourceType::SOH_Animation, 0 }, - { LUS::ResourceType::Texture, 0 }, - { LUS::ResourceType::SOH_PlayerAnimation, 0 }, - { LUS::ResourceType::DisplayList, 0 }, - { LUS::ResourceType::SOH_Room, 0 }, - { LUS::ResourceType::SOH_CollisionHeader, 0 }, - { LUS::ResourceType::SOH_Skeleton, 0 }, - { LUS::ResourceType::SOH_SkeletonLimb, 0 }, - { LUS::ResourceType::Matrix, 0 }, - { LUS::ResourceType::SOH_Path, 0 }, - { LUS::ResourceType::Vertex, 0 }, - { LUS::ResourceType::SOH_Cutscene, 0 }, - { LUS::ResourceType::Array, 0 }, - { LUS::ResourceType::SOH_Text, 0 }, - { LUS::ResourceType::Blob, 0 }, - }; -} diff --git a/OTRExporter/OTRExporter/VersionInfo.h b/OTRExporter/OTRExporter/VersionInfo.h deleted file mode 100644 index 03f8417f2..000000000 --- a/OTRExporter/OTRExporter/VersionInfo.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include -#include -#include "src/resource/Resource.h" - -extern std::map resourceVersions; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/VtxExporter.cpp b/OTRExporter/OTRExporter/VtxExporter.cpp deleted file mode 100644 index 009545d77..000000000 --- a/OTRExporter/OTRExporter/VtxExporter.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "VtxExporter.h" -#include -#include "VersionInfo.h" - - -void OTRExporter_Vtx::SaveArr(ZResource* res, const fs::path& outPath, const std::vector& vec, BinaryWriter* writer) -{ - WriteHeader(res, outPath, writer, LUS::ResourceType::Vertex); - - for (auto& res: vec) { - ZVtx* vtx = (ZVtx*)res; - writer->Write(vtx->x); - writer->Write(vtx->y); - writer->Write(vtx->z); - writer->Write(vtx->flag); - writer->Write(vtx->s); - writer->Write(vtx->t); - writer->Write(vtx->r); - writer->Write(vtx->g); - writer->Write(vtx->b); - writer->Write(vtx->a); - } - -} - -void OTRExporter_Vtx::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZVtx* vtx = (ZVtx*)res; - - WriteHeader(res, outPath, writer, LUS::ResourceType::Vertex); - - writer->Write((uint32_t)1); //Yes I'm hard coding it to one, it *should* be fine. - - writer->Write(vtx->x); - writer->Write(vtx->y); - writer->Write(vtx->z); - writer->Write(vtx->flag); - writer->Write(vtx->s); - writer->Write(vtx->t); - writer->Write(vtx->r); - writer->Write(vtx->g); - writer->Write(vtx->b); - writer->Write(vtx->a); -} diff --git a/OTRExporter/OTRExporter/VtxExporter.h b/OTRExporter/OTRExporter/VtxExporter.h deleted file mode 100644 index 433aadd2c..000000000 --- a/OTRExporter/OTRExporter/VtxExporter.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZVtx.h" -#include "Exporter.h" -#include - -class OTRExporter_Vtx : public OTRExporter -{ -public: - void SaveArr(ZResource* res, const fs::path& outPath, const std::vector&, BinaryWriter* writer); - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/OTRExporter/OTRExporter/command_macros_base.h b/OTRExporter/OTRExporter/command_macros_base.h deleted file mode 100644 index 3067d2ce1..000000000 --- a/OTRExporter/OTRExporter/command_macros_base.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef COMMAND_MACROS_BASE_H -#define COMMAND_MACROS_BASE_H - -/** - * Command Base macros intended for use in designing of more specific command macros - * Each macro packs bytes (B), halfwords (H) and words (W, for consistency) into a single word - */ - -#define _SHIFTL(v, s, w) \ - ((unsigned int) (((unsigned int)(v) & ((0x01 << (w)) - 1)) << (s))) -#define _SHIFTR(v, s, w) \ - ((unsigned int)(((unsigned int)(v) >> (s)) & ((0x01 << (w)) - 1))) - -//#define CMD_BBBB(a, b, c, d) (_SHIFTL(a, 24, 8) | _SHIFTL(b, 16, 8) | _SHIFTL(c, 8, 8) | _SHIFTL(d, 0, 8)) -#define CMD_BBBB(a, b, c, d) (_SHIFTL(d, 24, 8) | _SHIFTL(c, 16, 8) | _SHIFTL(b, 8, 8) | _SHIFTL(a, 0, 8)) - -//#define CMD_BBH(a, b, c) (_SHIFTL(a, 24, 8) | _SHIFTL(b, 16, 8) | _SHIFTL(c, 0, 16)) -#define CMD_BBH(a, b, c) (_SHIFTL(a, 0, 8) | _SHIFTL(b, 8, 8) | _SHIFTL(c, 16, 16)) - -//#define CMD_HBB(a, b, c) (_SHIFTL(a, 16, 16) | _SHIFTL(b, 8, 8) | _SHIFTL(c, 0, 8)) -#define CMD_HBB(a, b, c) (_SHIFTL(c, 24, 8) | _SHIFTL(b, 16, 8) | _SHIFTL(a, 0, 16)) - -//#define CMD_HH(a, b) (_SHIFTL(a, 16, 16) | _SHIFTL(b, 0, 16)) -#define CMD_HH(a, b) (_SHIFTL(b, 16, 16) | _SHIFTL(a, 0, 16)) - -#define CMD_W(a) (a) - -#if defined(__GNUC__) -#define CMD_F(a) {.f = (a)} -#else -#define CMD_F(a) {(a)} -#endif - -#define CMD_PTR(a) (u32)(a) - -#endif \ No newline at end of file diff --git a/OTRExporter/OTRExporter/z64cutscene.h b/OTRExporter/OTRExporter/z64cutscene.h deleted file mode 100644 index d5eb89482..000000000 --- a/OTRExporter/OTRExporter/z64cutscene.h +++ /dev/null @@ -1,290 +0,0 @@ -#ifndef Z64CUTSCENE_H -#define Z64CUTSCENE_H - -#if 0 -#include - -typedef struct { - /* 0x00 */ u16 entrance; // entrance index upon which the cutscene should trigger - /* 0x02 */ u8 ageRestriction; // 0 for adult only, 1 for child only, 2 for both ages - /* 0x03 */ u8 flag; // eventChkInf flag bound to the entrance cutscene - /* 0x04 */ void* segAddr; // segment offset location of the cutscene -} EntranceCutscene; // size = 0x8 - -typedef struct { - /* 0x00 */ s8 continueFlag; - /* 0x01 */ s8 cameraRoll; - /* 0x02 */ u16 nextPointFrame; - /* 0x04 */ f32 viewAngle; // in degrees - /* 0x08 */ Vec3s pos; -} CutsceneCameraPoint; // size = 0x10 - -typedef struct { - /* 0x00 */ Vec3f at; - /* 0x0C */ Vec3f eye; - /* 0x18 */ s16 roll; - /* 0x1A */ s16 fov; -} CutsceneCameraAngle; // size = 0x1C - -typedef struct { - /* 0x0 */ CutsceneCameraPoint* atPoints; - /* 0x4 */ CutsceneCameraPoint* eyePoints; - /* 0x8 */ s16 relativeToPlayer; -} CutsceneCameraMove; // size = 0xC - -typedef struct { - /* 0x00 */ u16 base; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; -} CsCmdBase; // size = 0x6 - -typedef struct { - /* 0x00 */ u8 unk_00; - /* 0x01 */ u8 setting; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; -} CsCmdEnvLighting; // size = 0x6 - -typedef struct { - /* 0x00 */ u8 unk_00; - /* 0x01 */ u8 sequence; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; -} CsCmdMusicChange; // size = 0x6 - -typedef struct { - /* 0x00 */ u16 type; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; -} CsCmdMusicFade; // size = 0x6 - -typedef struct { - /* 0x00 */ u16 unk_00; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; - /* 0x06 */ u8 unk_06; - /* 0x07 */ u8 unk_07; - /* 0x08 */ u8 unk_08; -} CsCmdUnknown9; // size = 0xA - -typedef struct { - /* 0x00 */ u16 unk_00; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; - /* 0x06 */ u8 hour; - /* 0x07 */ u8 minute; -} CsCmdDayTime; // size = 0x8 - -typedef struct { - /* 0x00 */ u16 base; - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; - /* 0x06 */ u16 type; - /* 0x08 */ u16 textId1; - /* 0x0A */ u16 textId2; -} CsCmdTextbox; // size = 0xC - -typedef struct { - /* 0x00 */ u16 action; // "dousa" - /* 0x02 */ u16 startFrame; - /* 0x04 */ u16 endFrame; - union { - /* 0x06 */ Vec3s rot; - /* 0x06 */ Vec3us urot; - }; - /* 0x0C */ Vec3i startPos; - /* 0x18 */ Vec3i endPos; - /* 0x24 */ Vec3i normal; -} CsCmdActorAction; // size = 0x30 -#endif - -typedef enum { - CS_STATE_IDLE, - CS_STATE_SKIPPABLE_INIT, - CS_STATE_SKIPPABLE_EXEC, - CS_STATE_UNSKIPPABLE_INIT, - CS_STATE_UNSKIPPABLE_EXEC -} CutsceneState; - -typedef enum { - CS_CMD_00 = 0x0000, - CS_CMD_CAM_EYE = 0x0001, - CS_CMD_CAM_AT = 0x0002, - CS_CMD_MISC = 0x0003, - CS_CMD_SET_LIGHTING = 0x0004, - CS_CMD_CAM_EYE_REL_TO_PLAYER = 0x0005, - CS_CMD_CAM_AT_REL_TO_PLAYER = 0x0006, - CS_CMD_07 = 0x0007, - CS_CMD_08 = 0x0008, - CS_CMD_09 = 0x0009, - CS_CMD_TEXTBOX = 0x0013, - CS_CMD_SET_PLAYER_ACTION = 0x000A, - CS_CMD_SET_ACTOR_ACTION_1 = 0x000F, - CS_CMD_SET_ACTOR_ACTION_2 = 0x000E, - CS_CMD_SET_ACTOR_ACTION_3 = 0x0019, - CS_CMD_SET_ACTOR_ACTION_4 = 0x001D, - CS_CMD_SET_ACTOR_ACTION_5 = 0x001E, - CS_CMD_SET_ACTOR_ACTION_6 = 0x002C, - CS_CMD_SET_ACTOR_ACTION_7 = 0x001F, - CS_CMD_SET_ACTOR_ACTION_8 = 0x0031, - CS_CMD_SET_ACTOR_ACTION_9 = 0x003E, - CS_CMD_SET_ACTOR_ACTION_10 = 0x008F, - CS_CMD_SCENE_TRANS_FX = 0x002D, - CS_CMD_NOP = 0x000B, - CS_CMD_PLAYBGM = 0x0056, - CS_CMD_STOPBGM = 0x0057, - CS_CMD_FADEBGM = 0x007C, - CS_CMD_SETTIME = 0x008C, - CS_CMD_TERMINATOR = 0x03E8, - CS_CMD_END = 0xFFFF -} CutsceneCmd; - -/** - * Special type for blocks of cutscene data, asm-processor checks - * arrays for CutsceneData type and converts floats within the array - * to their IEEE-754 representation. The array must close with }; - * on its own line. - * - * Files that contain this type that are included in other C files - * must include an 'EARLY' qualifier to inform asm-processor that it - * must recursively process that include. - * - * Example: #include "file.c" EARLY - */ - - -typedef union CutsceneData { - int i; - float f; - short s[2]; - char b[4]; -} CutsceneData; - -#define CS_CMD_CONTINUE 0 -#define CS_CMD_STOP -1 - -// TODO confirm correctness, clarify names -typedef enum { - /* 0x00 */ INVALID_DESTINATION_0, - /* 0x01 */ CUTSCENE_MAP_GANON_HORSE, - /* 0x02 */ CUTSCENE_MAP_THREE_GODESSES_POST_DEKU_TREE, - /* 0x03 */ GERUDO_VALLEY_DIN, - /* 0x04 */ DEATH_MOUNTAIN_TRAIL_NAYRU, - /* 0x05 */ KOKIRI_FOREST_FARORE, - /* 0x06 */ CUTSCENE_MAP_TRIFORCE_CREATION, - /* 0x07 */ KOKIRI_FOREST_RECEIVE_KOKIRI_EMERALD, - /* 0x08 */ TEMPLE_OF_TIME_AFTER_USE_MS, - /* 0x09 */ GERUDO_VALLEY_DIN_2, - /* 0x0A */ LINKS_HOUSE_INTRO, - /* 0x0B */ KOKIRI_FOREST_INTRO, - /* 0x0C */ DEATH_MOUNTAIN_TRAIL_AFTER_GORON_RUBY, - /* 0x0D */ ZORAS_FOUNTAIN_AFTER_ZORAS_SAPPHIRE, - /* 0x0E */ KOKIRI_FOREST_AFTER_KOKIRI_EMERALD, - /* 0x0F */ TEMPLE_OF_TIME_KOKIRI_EMERALD, //unused - /* 0x10 */ TEMPLE_OF_TIME_GORON_RUBY, //unused - /* 0x11 */ TEMPLE_OF_TIME_ZORAS_SAPPHIRE, //unused - /* 0x12 */ TEMPLE_OF_TIME_AFTER_USE_MS_FIRST, - /* 0x13 */ DEATH_MOUNTAIN_TRAIL_AFTER_INTRO, - /* 0x14 */ INVALID_DESTINATION_14, - /* 0x15 */ LAKE_HYLIA_WATER_RISES, - /* 0x16 */ DESERT_COLOSSUS_REQUIEM, - /* 0x17 */ CUTSCENE_MAP_CURSE_YOU, - /* 0x18 */ JABU_JABU_INTRO, - /* 0x19 */ CHAMBER_OF_SAGES_LIGHT_MEDALLION, - /* 0x1A */ TEMPLE_OF_TIME_KOKIRI_EMERALD_2, //duplicate of 0x000F - /* 0x1B */ TEMPLE_OF_TIME_GORON_RUBY_2, //duplicate of 0x0010 - /* 0x1C */ TEMPLE_OF_TIME_ZORAS_SAPPHIRE_2, //duplicate of 0x0011 - /* 0x1D */ CHAMBER_OF_SAGES_FOREST_MEDALLION, - /* 0x1E */ CHAMBER_OF_SAGES_FIRE_MEDALLION, - /* 0x1F */ CHAMBER_OF_SAGES_WATER_MEDALLION, - /* 0x20 */ HYRULE_FIELD_FLASHBACK, //lacs part 4 - /* 0x21 */ HYRULE_FIELD_AFTER_LAKE_HYLIA_OWL, - /* 0x22 */ CUTSCENE_MAP_GANON_AFTER_USE_MS, - /* 0x23 */ HYRULE_FIELD_INTRO_ZELDA_ESCAPE, - /* 0x24 */ INVALID_DESTINATION_24, - /* 0x25 */ INVALID_DESTINATION_25, - /* 0x26 */ CUTSCENE_MAP_SHEIKAH_LEGEND, //lacs part 2 - /* 0x27 */ TEMPLE_OF_TIME_ZELDA_REVEAL, //lacs part 3 - /* 0x28 */ TEMPLE_OF_TIME_GET_LIGHT_ARROWS, //lacs part 5 - /* 0x29 */ LAKE_HYLIA_AFTER_BLUE_WARP, - /* 0x2A */ KAKARIKO_VILLAGE_DRAIN_WELL, - /* 0x2B */ WINDMILL_AFTER_DRAIN_WELL, - /* 0x2C */ TEMPLE_OF_TIME_AFTER_DOOR_OF_TIME_OPENS, - /* 0x2D */ INVALID_DESTINATION_2D, - /* 0x2E */ TEMPLE_OF_TIME_AFTER_USE_MS_FIRST_2, // duplicate of 0x0012 - /* 0x2F */ KAKARIKO_VILLAGE_NOCTURNE_PART_2, - /* 0x30 */ DESERT_COLOSSUS_AFTER_REQUIEM, - /* 0x31 */ TEMPLE_OF_TIME_AFTER_LIGHT_ARROWS, - /* 0x32 */ KAKARIKO_VILLAGE_AFTER_NOCTURNE, - /* 0x33 */ HYRULE_FIELD_IMPA_ESCORT_CS, - /* 0x34 */ TEMPLE_OF_TIME_SONG_OF_TIME, - /* 0x35 */ HYRULE_FIELD_AFTER_SONG_OF_TIME, - /* 0x36 */ GERUDO_VALLEY_CREDITS, - /* 0x37 */ GERUDO_FORTRESS_CREDITS, - /* 0x38 */ KAKARIKO_VILLAGE_CREDITS, - /* 0x39 */ DEATH_MOUNTAIN_TRAIL_CREDITS_1, - /* 0x3A */ GORON_CITY_CREDITS, // unused? - /* 0x3B */ LAKE_HYLIA_CREDITS, - /* 0x3C */ ZORAS_FOUNTAIN_CREDITS, // unused - /* 0x3D */ ZORAS_DOMAIN_CREDITS, - /* 0x3E */ KOKIRI_FOREST_CREDITS_1, - /* 0x3F */ KOKIRI_FOREST_CREDITS_2, - /* 0x40 */ HYRULE_FIELD_CREDITS, - /* 0x41 */ LON_LON_RANCH_CREDITS_1, - /* 0x42 */ KAKARIKO_VILLAGE_AFTER_TRAIL_OWL, - /* 0x43 */ HTRULE_FIELD_UNUSED_ENTRANCE, - /* 0x44 */ CUTSCENE_MAP_FIRE, - /* 0x45 */ KOKIRI_FOREST_POST_FOREST_MEDALLION, - /* 0x46 */ DEATH_MOUNTAIN_TRAIL_CREDITS_2, - /* 0x47 */ TEMPLE_OF_TIME_CREDITS, - /* 0x48 */ ZELDAS_COURTYARD_CREDITS, - /* 0x49 */ LON_LON_RANCH_CREDITS_1_2, // duplicate of 0x0041 - /* 0x4A */ LON_LON_RANCH_CREDITS_2, - /* 0x4B */ LON_LON_RANCH_CREDITS_3, - /* 0x4C */ LON_LON_RANCH_CREDITS_4, - /* 0x4D */ LON_LON_RANCH_CREDITS_5, - /* 0x4E */ LON_LON_RANCH_CREDITS_6, - /* 0x4F */ LON_LON_RANCH_NO_CS_1, - /* 0x50 */ LON_LON_RANCH_NO_CS_2, - /* 0x51 */ LON_LON_RANCH_NO_CS_3, - /* 0x52 */ LON_LON_RANCH_NO_CS_4, - /* 0x53 */ LON_LON_RANCH_NO_CS_5, - /* 0x54 */ LON_LON_RANCH_NO_CS_6, - /* 0x55 */ LON_LON_RANCH_NO_CS_7, - /* 0x56 */ LON_LON_RANCH_NO_CS_8, - /* 0x57 */ LON_LON_RANCH_NO_CS_9, - /* 0x58 */ LON_LON_RANCH_NO_CS_10, - /* 0x59 */ LON_LON_RANCH_NO_CS_11, - /* 0x5A */ LON_LON_RANCH_NO_CS_12, - /* 0x5B */ LON_LON_RANCH_NO_CS_13, - /* 0x5C */ LON_LON_RANCH_NO_CS_14, - /* 0x5D */ LON_LON_RANCH_NO_CS_15, - /* 0x5E */ LON_LON_RANCH_NO_CS_EPONAS_SONG, - /* 0x5F */ CONDITIONAL_DESTINATION, // TODO more descriptive name? - /* 0x60 */ DESERT_COLOSSUS_SPIRIT_BLUE_WARP, - /* 0x61 */ GRAVEYARD_AFTER_SHADOW_BLUE_WARP, - /* 0x62 */ DEATH_MOUNTAIN_CRATER_AFTER_FIRE_BLUE_WARP, - /* 0x63 */ SACRED_FOREST_MEADOW_AFTER_FOREST_BLUE_WARP, - /* 0x64 */ KOKIRI_FOREST_AFTER_FOREST_BLUE_WARP, - /* 0x65 */ DESERT_COLOSSUS_AFTER_SILVER_GAUNTLETS, - /* 0x66 */ TEMPLE_OF_TIME_FRONT_OF_PEDESTAL, - /* 0x67 */ HYRULE_FIELD_TITLE_SCREEN, - /* 0x68 */ SPIRIT_TEMPLE_BOSS_TITLE_SCREEN, - /* 0x69 */ GRAVEYARD_SUNS_SONG, - /* 0x6A */ ROYAL_FAMILYS_TOMB_SUNS_SONG, - /* 0x6B */ GANONS_CASTLE_AFTER_FOREST_TRIAL, - /* 0x6C */ GANONS_CASTLE_AFTER_WATER_TRIAL, - /* 0x6D */ GANONS_CASTLE_AFTER_SHADOW_TRIAL, - /* 0x6E */ GANONS_CASTLE_AFTER_FIRE_TRIAL, - /* 0x6F */ GANONS_CASTLE_AFTER_LIGHT_TRIAL, - /* 0x70 */ GANONS_CASTLE_AFTER_SPIRIT_TRIAL, - /* 0x71 */ GANONS_CASTLE_DISPEL_BARRIER_IF_CONDITIONS, - /* 0x72 */ HYRULE_FIELD_INTRO, - /* 0x73 */ HYRULE_FIELD_AFTER_IMPA_ESCORT, - /* 0x74 */ DESERT_COLOSSUS_SPIRIT_BLUE_WARP_2, - /* 0x75 */ HYRULE_FIELD_SKY, - /* 0x76 */ GANON_BATTLE_TOWER_COLLAPSE, - /* 0x77 */ ZELDAS_COURTYARD_RECEIVE_LETTER -} CutsceneTerminatorDestination; - -#endif \ No newline at end of file diff --git a/OTRExporter/OTRExporter/z64cutscene_commands.h b/OTRExporter/OTRExporter/z64cutscene_commands.h deleted file mode 100644 index 5d440cce9..000000000 --- a/OTRExporter/OTRExporter/z64cutscene_commands.h +++ /dev/null @@ -1,448 +0,0 @@ -#ifndef Z64CUTSCENE_COMMANDS_H -#define Z64CUTSCENE_COMMANDS_H - -#include "command_macros_base.h" -#include "z64cutscene.h" - -/** - * ARGS - * s32 totalEntries (e), s32 endFrame (n) - * FORMAT - * eeeeeeee nnnnnnnn - * size = 0x8 - */ -#define CS_BEGIN_CUTSCENE(totalEntries, endFrame) CMD_W(totalEntries), CMD_W(endFrame) - - /** - * ARGS - * s16 startFrame (s), s16 endFrame (e) - * FORMAT - * 00000001 0001ssss eeee0000 - * size = 0xC - */ -#define CS_CAM_POS_LIST CS_CAM_EYE_LIST -#define CS_CAM_EYE_LIST(startFrame, endFrame) \ - CS_CMD_CAM_EYE, CMD_HH(0x0001, startFrame), CMD_HH(endFrame, 0x0000) - - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CAM_POS CS_CAM_EYE -#define CS_CAM_EYE(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s16 startFrame (s), s16 endFrame (e) - * FORMAT - * 00000002 0001ssss eeee0000 - * size = 0xC - */ -#define CS_CAM_FOCUS_POINT_LIST CS_CAM_AT_LIST -#define CS_CAM_AT_LIST(startFrame, endFrame) \ - CS_CMD_CAM_AT, CMD_HH(0x0001, startFrame), CMD_HH(endFrame, 0x0000) - - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CAM_FOCUS_POINT CS_CAM_AT -#define CS_CAM_AT(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000003 eeeeeeee - * size = 0x8 - */ -#define CS_MISC_LIST(entries) CS_CMD_MISC, CMD_W(entries) - - /** - * ARGS - * s16 unk (u), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * uuuussss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU - * size = 0x30 - */ -#define CS_MISC(unk, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7, unused8, unused9, unused10) \ - CMD_HH(unk, startFrame), CMD_HH(endFrame, unused0), \ - CMD_W(unused1), CMD_W(unused2), CMD_W(unused3), CMD_W(unused4), CMD_W(unused5), \ - CMD_W(unused6), CMD_W(unused7), CMD_W(unused8), CMD_W(unused9), CMD_W(unused10) - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000004 eeeeeeee - * size = 0x8 - */ -#define CS_LIGHTING_LIST(entries) CS_CMD_SET_LIGHTING, CMD_W(entries) - - /** - * ARGS - * s16 setting (m), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * mmmmssss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU 00000000 00000000 00000000 - * size = 0x30 - */ -#define CS_LIGHTING(setting, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7) \ - CMD_HH(setting, startFrame), CMD_HH(endFrame, unused0), \ - CMD_W(unused1), CMD_W(unused2), CMD_W(unused3), CMD_W(unused4), CMD_W(unused5), \ - CMD_W(unused6), CMD_W(unused7), 0x00000000, 0x00000000, 0x00000000 - - /** - * ARGS - * s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused , may be consistently zero - * 00000005 0001ssss eeee0000 - * size = 0xC - */ -#define CS_CAM_POS_PLAYER_LIST CS_CAM_EYE_REL_TO_PLAYER_LIST -#define CS_CAM_EYE_REL_TO_PLAYER_LIST(startFrame, endFrame) \ - CS_CMD_CAM_EYE_REL_TO_PLAYER, CMD_HH(0x0001, startFrame), CMD_HH(endFrame, 0x0000) - - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CAM_POS_PLAYER CS_CAM_EYE_REL_TO_PLAYER -#define CS_CAM_EYE_REL_TO_PLAYER(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused , may be consistently zero - * 00000006 0001ssss eeee0000 - * size = 0xC - */ -#define CS_CAM_FOCUS_POINT_PLAYER_LIST CS_CAM_AT_REL_TO_PLAYER_LIST -#define CS_CAM_AT_REL_TO_PLAYER_LIST(startFrame, endFrame) \ - CS_CMD_CAM_AT_REL_TO_PLAYER, CMD_HH(0x0001, startFrame), CMD_HH(endFrame, 0x0000) - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CAM_FOCUS_POINT_PLAYER CS_CAM_AT_REL_TO_PLAYER -#define CS_CAM_AT_REL_TO_PLAYER(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s16 unk (u), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * 00000007 uuuussss eeeeUUUU - * size = 0xC - */ -#define CS_CMD_07_LIST(unk, startFrame, endFrame, unused) \ - CS_CMD_07, CMD_HH(unk, startFrame), CMD_HH(endFrame, unused) - - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CMD_07(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s16 unk (u), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * 00000008 uuuussss eeeeUUUU - * size = 0xC - */ -#define CS_CMD_08_LIST(unk, startFrame, endFrame, unused) \ - CS_CMD_08, CMD_HH(unk, startFrame), CMD_HH(endFrame, unused) - - /** - * ARGS - * s8 continueFlag (c), s8 roll (r), s16 frame (f), f32 viewAngle (a), - * s16 xPos (x), s16 yPos (y), s16 zPos (z) - * FORMAT - * Capital U is Unused - * ccrrffff aaaaaaaa xxxxyyyy zzzzUUUU - * size = 0x10 - */ -#define CS_CMD_08(continueFlag, roll, frame, viewAngle, xPos, yPos, zPos, unused) \ - CMD_BBH(continueFlag, roll, frame), CMD_F(viewAngle), CMD_HH(xPos, yPos), CMD_HH(zPos, unused) - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000009 eeeeeeee - * size = 0x8 - */ -#define CS_CMD_09_LIST(entries) CS_CMD_09, CMD_W(entries) - - /** - * ARGS - * s16 unk (u), s16 startFrame (s), s16 endFrame (e), s16 unk2 (v), s16 unk3 (w), s16 unk4 (x) - * FORMAT - * Capital U is Unused - * uuuussss eeeevvww xxUUUUUU - * size = 0xC - */ -#define CS_CMD_09(unk, startFrame, endFrame, unk2, unk3, unk4, unused0, unused1) \ - CMD_HH(unk, startFrame), CMD_HBB(endFrame, unk2, unk3), CMD_BBH(unk4, unused0, unused1) - - /** - * ARGS - * s32 cmdType (c), s32 entries (e) - * FORMAT - * cccccccc eeeeeeee - * size = 0x8 - */ -#define CS_UNK_DATA_LIST(cmdType, entries) CMD_W(cmdType), CMD_W(entries) - - /** - * ARGS - * s32 unk1 (a), s32 unk2 (b), s32 unk3 (c), s32 unk4 (d), s32 unk5 (e), s32 unk6 (f), - * s32 unk7 (g), s32 unk8 (h), s32 unk9 (i), s32 unk10 (j), s32 unk11 (k), s32 unk12 (l) - * FORMAT - * aaaaaaaa bbbbbbbb cccccccc dddddddd eeeeeeee ffffffff gggggggg hhhhhhhh iiiiiiii jjjjjjjj kkkkkkkk llllllll - * size = 0x30 - */ -#define CS_UNK_DATA(unk1, unk2, unk3, unk4, unk5, unk6, unk7, unk8, unk9, unk10, unk11, unk12) \ - CMD_W(unk1), CMD_W(unk2), CMD_W(unk3), CMD_W(unk4), CMD_W(unk5), CMD_W(unk6), \ - CMD_W(unk7), CMD_W(unk8), CMD_W(unk9), CMD_W(unk10), CMD_W(unk11), CMD_W(unk12) - - /** - * ARGS - * s32 cmdType (c), s32 entries (e) - * FORMAT - * cccccccc eeeeeeee - * size = 0x8 - */ -#define CS_NPC_ACTION_LIST(cmdType, entries) CMD_W(cmdType), CMD_W(entries) - - /** - * ARGS - * s16 npcAction (a), s16 startFrame (s), s16 endFrame (e), - * s16 rotX (u), s16 rotY (v), s16 rotZ (w), - * s32 startX (i), s32 startY (j), s32 startZ (k), - * s32 endX (l), s32 endY (m), s32 endZ (n), - * f32 normX (x), f32 normY (y), f32 normZ (z), - * FORMAT - * aaaassss eeeeuuuu vvvvwwww iiiiiiii jjjjjjjj kkkkkkkk llllllll mmmmmmmm nnnnnnnn xxxxxxxx yyyyyyyy zzzzzzzz - * size = 0x30 - */ -#define CS_NPC_ACTION(npcAction, startFrame, endFrame, rotX, rotY, rotZ, startX, startY, startZ, endX, endY, endZ, normX, normY, normZ) \ - CMD_HH(npcAction, startFrame), CMD_HH(endFrame, rotX), CMD_HH(rotY, rotZ), \ - CMD_W(startX), CMD_W(startY), CMD_W(startZ), \ - CMD_W(endX), CMD_W(endY), CMD_W(endZ), \ - CMD_F(normX), CMD_F(normY), CMD_F(normZ) - - /** - * ARGS - * s32 cmdType (c), s32 entries (e) - * FORMAT - * cccccccc eeeeeeee - * size = 0x8 - */ -#define CS_PLAYER_ACTION_LIST(entries) CS_CMD_SET_PLAYER_ACTION, CMD_W(entries) - - /** - * ARGS - * s16 linkAction (a), s16 startFrame (s), s16 endFrame (e), - * s16 rotX (u), s16 rotY (v), s16 rotZ (w), - * s32 startX (i), s32 startY (j), s32 startZ (k), - * s32 endX (l), s32 endY (m), s32 endZ (n), - * f32 normX (x), f32 normY (y), f32 normZ (z), - * FORMAT - * aaaassss eeeeuuuu vvvvwwww iiiiiiii jjjjjjjj kkkkkkkk llllllll mmmmmmmm nnnnnnnn xxxxxxxx yyyyyyyy zzzzzzzz - * size = 0x30 - */ -#define CS_PLAYER_ACTION(linkAction, startFrame, endFrame, rotX, rotY, rotZ, startX, startY, startZ, endX, endY, endZ, normX, normY, normZ) \ - CS_NPC_ACTION(linkAction, startFrame, endFrame, rotX, rotY, rotZ, startX, startY, startZ, endX, endY, endZ, normX, normY, normZ) - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000013 eeeeeeee - * size = 0x8 - */ -#define CS_TEXT_LIST(entries) CS_CMD_TEXTBOX, CMD_W(entries) - - /** - * ARGS - * s16 messageId (i), s16 startFrame (s), s16 endFrame (e), s16 type (o), - * s16 topOptionBranch (y), s16 bottomOptionBranch (n) - * FORMAT - * iiiissss eeeeoooo yyyynnnn - * size = 0xC - */ -#define CS_TEXT_DISPLAY_TEXTBOX(messageId, startFrame, endFrame, type, topOptionBranch, bottomOptionBranch) \ - CMD_HH(messageId, startFrame), CMD_HH(endFrame, type), CMD_HH(topOptionBranch, bottomOptionBranch) - - /** - * ARGS - * s16 startFrame (s), s16 endFrame (e) - * FORMAT - * FFFFssss eeeeFFFF FFFFFFFF - * size = 0xC - */ -#define CS_TEXT_NONE(startFrame, endFrame) \ - CS_TEXT_DISPLAY_TEXTBOX(0xFFFF, startFrame, endFrame, 0xFFFF, 0xFFFF, 0xFFFF) - - /** - * ARGS - * s16 ocarinaSongAction (o), s16 startFrame (s), s16 endFrame (e), s16 topOptionBranch (i) - * FORMAT - * oooossss eeee0002 iiiiFFFF - * size = 0xC - */ -#define CS_TEXT_LEARN_SONG(ocarinaSongAction, startFrame, endFrame, messageId) \ - CS_TEXT_DISPLAY_TEXTBOX(ocarinaSongAction, startFrame, endFrame, 0x0002, messageId, 0xFFFF) - - /** - * ARGS - * s16 transitionType (t), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused , endFrame duplicate - * 0000002D 00000001 ttttssss eeeeUUUU - * size = 0x10 - */ -#define CS_SCENE_TRANS_FX(transitionType, startFrame, endFrame) \ - CS_CMD_SCENE_TRANS_FX, 0x00000001, CMD_HH(transitionType, startFrame), CMD_HH(endFrame, endFrame) - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000056 eeeeeeee - * size = 0x8 - */ -#define CS_PLAY_BGM_LIST(entries) CS_CMD_PLAYBGM, CMD_W(entries) - - /** - * ARGS - * s16 sequence (q), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * qqqqssss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU 00000000 00000000 00000000 - * size = 0x30 - */ -#define CS_PLAY_BGM(sequence, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7) \ - CMD_HH(sequence, startFrame), CMD_HH(endFrame, unused0), \ - CMD_W(unused1), CMD_W(unused2), CMD_W(unused3), CMD_W(unused4), CMD_W(unused5), \ - CMD_W(unused6), CMD_W(unused7), 0x00000000, 0x00000000, 0x00000000 - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 00000057 eeeeeeee - * size = 0x8 - */ -#define CS_STOP_BGM_LIST(entries) CS_CMD_STOPBGM, CMD_W(entries) - - /** - * ARGS - * s16 sequence (q), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * uuqqssss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU 00000000 00000000 00000000 - * size = 0x30 - */ -#define CS_STOP_BGM(sequence, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7) \ - CMD_HH(sequence, startFrame), CMD_HH(endFrame, unused0), \ - CMD_W(unused1), CMD_W(unused2), CMD_W(unused3), CMD_W(unused4), CMD_W(unused5), \ - CMD_W(unused6), CMD_W(unused7), 0x00000000, 0x00000000, 0x00000000 - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 0000007C eeeeeeee - * size = 0x8 - */ -#define CS_FADE_BGM_LIST(entries) CS_CMD_FADEBGM, CMD_W(entries) - - /** - * ARGS - * s16 fadeType (t), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused - * ttttssss eeeeUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU UUUUUUUU 00000000 00000000 00000000 - * size = 0x30 - */ -#define CS_FADE_BGM(fadeType, startFrame, endFrame, unused0, unused1, unused2, unused3, unused4, unused5, unused6, unused7) \ - CMD_HH(fadeType, startFrame), CMD_HH(endFrame, unused0), \ - CMD_W(unused1), CMD_W(unused2), CMD_W(unused3), CMD_W(unused4), CMD_W(unused5), \ - CMD_W(unused6), CMD_W(unused7), 0x00000000, 0x00000000, 0x00000000 - - /** - * ARGS - * s32 entries (e) - * FORMAT - * 0000008C eeeeeeee - * size = 0x8 - */ -#define CS_TIME_LIST(entries) CS_CMD_SETTIME, CMD_W(entries) - - /** - * ARGS - * s16 unk (u), s16 startFrame (s), s16 endFrame (e), s8 hour (h), s8 min (m) - * FORMAT - * Capital U is Unused - * uuuussss eeeehhmm UUUUUUUU - * size = 0xC - */ -#define CS_TIME(unk, startFrame, endFrame, hour, min, unused) \ - CMD_HH(unk, startFrame), \ - CMD_HBB(endFrame, hour, min), \ - CMD_W(unused) - - /** - * ARGS - * CutsceneTerminatorDestination dest (d), s16 startFrame (s), s16 endFrame (e) - * FORMAT - * Capital U is Unused , endFrame duplicate - * 000003E8 00000001 ddddssss eeeeUUUU - * size = 0x10 - */ -#define CS_TERMINATOR(dest, startFrame, endFrame) \ - CS_CMD_TERMINATOR, 0x00000001, CMD_HH(dest, startFrame), CMD_HH(endFrame, endFrame) - - /** - * Marks the end of a cutscene - */ -#define CS_END() 0xFFFFFFFF, 0x00000000 - -#endif \ No newline at end of file diff --git a/OTRExporter/extract_assets.py b/OTRExporter/extract_assets.py deleted file mode 100755 index c6d5282a4..000000000 --- a/OTRExporter/extract_assets.py +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env python3 - -import os, sys, shutil -import shutil -from rom_info import Z64Rom -import rom_chooser -import struct -import subprocess -import argparse - -def BuildOTR(xmlPath, rom, zapd_exe=None, genHeaders=None): - shutil.copytree("assets", "Extract/assets") - - if not zapd_exe: - zapd_exe = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out" - - exec_cmd = [zapd_exe, "ed", "-i", xmlPath, "-b", rom, "-fl", "CFG/filelists", - "-o", "placeholder", "-osf", "placeholder", "-rconf", "CFG/Config.xml"] - - # generate headers, but not otrs by excluding the otr exporter - if genHeaders: - exec_cmd.extend(["-gsf", "1"]) - else: - # generate otrs, but not headers - exec_cmd.extend(["-gsf", "0", "-se", "OTR", "--otrfile", - "oot-mq.otr" if Z64Rom.isMqRom(rom) else "oot.otr"]) - - print(exec_cmd) - exitValue = subprocess.call(exec_cmd) - if exitValue != 0: - print("\n") - print("Error when building the OTR file...", file=os.sys.stderr) - print("Aborting...", file=os.sys.stderr) - print("\n") - -def BuildSohOtr(zapd_exe=None): - shutil.copytree("assets", "Extract/assets") - - if not zapd_exe: - zapd_exe = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out" - - exec_cmd = [zapd_exe, "botr", "-se", "OTR", "--norom"] - - print(exec_cmd) - exitValue = subprocess.call(exec_cmd) - if exitValue != 0: - print("\n") - print("Error when building soh.otr file...", file=os.sys.stderr) - print("Aborting...", file=os.sys.stderr) - print("\n") - -def main(): - parser = argparse.ArgumentParser() - parser.add_argument("-z", "--zapd", help="Path to ZAPD executable", dest="zapd_exe", type=str) - parser.add_argument("rom", help="Path to the rom", type=str, nargs="?") - parser.add_argument("--non-interactive", help="Runs the script non-interactively for use in build scripts.", dest="non_interactive", action="store_true") - parser.add_argument("-v", "--verbose", help="Display rom's header checksums and their corresponding xml folder", dest="verbose", action="store_true") - parser.add_argument("--gen-headers", help="Generate source headers to be checked in", dest="gen_headers", action="store_true") - parser.add_argument("--norom", help="Generate only soh.otr to be bundled to the game", dest="norom", action="store_true") - - args = parser.parse_args() - - if args.norom: - if (os.path.exists("Extract")): - shutil.rmtree("Extract") - - BuildSohOtr(args.zapd_exe) - return - - roms = [ Z64Rom(args.rom) ] if args.rom else rom_chooser.chooseROM(args.verbose, args.non_interactive) - for rom in roms: - if (os.path.exists("Extract")): - shutil.rmtree("Extract") - - BuildOTR("../soh/assets/xml/" + rom.version.xml_ver + "/", rom.file_path, zapd_exe=args.zapd_exe, genHeaders=args.gen_headers) - -if __name__ == "__main__": - main() diff --git a/OTRExporter/extract_baserom.py b/OTRExporter/extract_baserom.py deleted file mode 100644 index f387df57a..000000000 --- a/OTRExporter/extract_baserom.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/python3 - -import os -import sys -import struct -from multiprocessing import Pool, cpu_count -from rom_info import Z64Rom -import rom_chooser - - -rom = None - -def initialize_worker(input_rom): - global rom - rom = input_rom - -def ExtractFunc(i): - - dma_file = rom.getDmaEntryByIndex(i) - dma_data = rom.readDmaEntry(dma_file) - - filename = '../soh/baserom/' + rom.version.file_table[i] - print('extracting ' + filename + " (0x%08X, 0x%08X)" % (dma_file.virtStart, dma_file.virtEnd)) - - try: - with open(filename, 'wb') as f: - f.write(dma_data) - except IOError: - print('failed to write file ' + filename) - - # TODO: handle this better - if dma_file.compressed: - os.system('tools/yaz0 -d ' + filename + ' ' + filename) - -##################################################################### - -def main(): - try: - os.mkdir('../soh/baserom') - except: - pass - - rom_path = rom_chooser.chooseROM() - input_rom = Z64Rom(rom_path) - - # extract files - num_cores = cpu_count() - print("Extracting baserom with " + str(num_cores) + " CPU cores.") - with Pool(num_cores, initialize_worker, (input_rom,)) as p: - p.map(ExtractFunc, range(len(input_rom.version.file_table))) - -if __name__ == "__main__": - main() diff --git a/OTRExporter/offsets.json b/OTRExporter/offsets.json deleted file mode 100644 index e03311620..000000000 --- a/OTRExporter/offsets.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "MQDebug": { - "bankdefs": [1281424, 128], - "fontdefs": [1278576, 624], - "fontmaps": [1279200, 448], - "seqdefs": [1279648, 1776] - } -} \ No newline at end of file diff --git a/OTRExporter/rom_chooser.py b/OTRExporter/rom_chooser.py deleted file mode 100644 index fa5fcc281..000000000 --- a/OTRExporter/rom_chooser.py +++ /dev/null @@ -1,54 +0,0 @@ -import os, sys, glob - -from rom_info import Z64Rom - -def chooseROM(verbose=False, non_interactive=False): - roms = [] - - for file in glob.glob("*.z64"): - rom = Z64Rom(file) - if rom.is_valid: - roms.append(rom) - - if not (roms): - print("Error: No roms located, place one in the OTRExporter directory", file=os.sys.stderr) - sys.exit(1) - - if (len(roms) == 1): - return roms - - if non_interactive: - mq_rom = None - non_mq_rom = None - for rom in roms: - if rom.isMq and mq_rom is None: - mq_rom = rom - elif not rom.isMq and non_mq_rom is None: - non_mq_rom = rom - return [rom for rom in [non_mq_rom, mq_rom] if rom is not None] - - print(f"{len(roms)} roms found, please select one by pressing 1-{len(roms)}") - print() - - for i in range(len(roms)): - print(f"[{i+1:>2d}] {roms[i].file_path}") - if verbose: - print(f" Checksum: {roms[i].checksum.value}, Version XML: {roms[i].version.xml_ver}") - print() - - while(1): - try: - selection = int(input()) - except KeyboardInterrupt: - sys.exit(1) - except: - print("Bad input. Try again with the number keys.") - continue - - if (selection < 1 or selection > len(roms)): - print("Bad input. Try again.") - continue - - else: break - - return [ roms[selection - 1] ] diff --git a/OTRExporter/rom_info.py b/OTRExporter/rom_info.py deleted file mode 100644 index 8bf471cf0..000000000 --- a/OTRExporter/rom_info.py +++ /dev/null @@ -1,99 +0,0 @@ -from enum import Enum -from tabnanny import check -import struct - -class Checksums(Enum): - OOT_NTSC_10 = "EC7011B7" - OOT_NTSC_11 = "D43DA81F" - OOT_NTSC_12 = "693BA2AE" - OOT_PAL_10 = "B044B569" - OOT_PAL_11 = "B2055FBD" - OOT_NTSC_JP_GC_CE = "F7F52DB8" - OOT_NTSC_JP_GC = "F611F4BA" - OOT_NTSC_US_GC = "F3DD35BA" - OOT_PAL_GC = "09465AC3" - OOT_NTSC_JP_MQ = "F43B45BA" - OOT_NTSC_US_MQ = "F034001A" - OOT_PAL_MQ = "1D4136F3" - OOT_PAL_GC_DBG1 = "871E1C92" - OOT_PAL_GC_DBG2 = "87121EFE" - OOT_PAL_GC_MQ_DBG = "917D18F6" - OOT_IQUE_TW = "3D81FB3E" - OOT_IQUE_CN = "B1E1E07B" - OOT_UNKNOWN = "FFFFFFFF" - - @classmethod - def has_value(self, value): - return value in self._value2member_map_ - -class RomVersion: - def __init__(self, file_table_path, file_table_off, xml_ver): - self.file_table_off = file_table_off - self.xml_ver = xml_ver - with open(file_table_path, 'r') as f: - self.file_table = [line.strip('\n') for line in f] - -ROM_INFO_TABLE = dict() -ROM_INFO_TABLE[Checksums.OOT_PAL_GC] = RomVersion("CFG/filelists/gamecube_pal.txt", 0x7170, "GC_NMQ_PAL_F") -ROM_INFO_TABLE[Checksums.OOT_PAL_MQ] = RomVersion("CFG/filelists/gamecube_pal.txt", 0x7170, "GC_MQ_PAL_F") -ROM_INFO_TABLE[Checksums.OOT_PAL_GC_DBG1] = RomVersion("CFG/filelists/dbg.txt", 0x12F70, "GC_NMQ_D") -ROM_INFO_TABLE[Checksums.OOT_PAL_GC_MQ_DBG] = RomVersion("CFG/filelists/dbg.txt", 0x12F70, "GC_MQ_D") -ROM_INFO_TABLE[Checksums.OOT_PAL_11] = RomVersion("CFG/filelists/pal_oot.txt", 0x7950, "N64_PAL_11") - -class RomDmaEntry: - def __init__(self, rom, i): - - off = rom.version.file_table_off + 16 * i - - (self.virtStart, \ - self.virtEnd, \ - self.physStart, \ - self.physEnd) = struct.unpack('>IIII', rom.rom_data[off:off+4*4]) - - self.compressed = self.physEnd != 0 - self.size = self.physEnd - self.physStart \ - if self.compressed \ - else self.virtEnd - self.virtStart - self.name = rom.version.file_table[i] - - -class Z64Rom: - def __init__(self, file_path): - self.file_path = file_path - with open(file_path, 'rb') as f: - self.rom_data = f.read() - - self.is_valid = len(self.rom_data) > 20 * 1024 * 1024 - - if not self.is_valid: - return - - # get checkum - checksum_str = self.rom_data[16:16+4].hex().upper() - self.checksum = Checksums(checksum_str) if Checksums.has_value(checksum_str) else Checksums.OOT_UNKNOWN - - if self.checksum == Checksums.OOT_UNKNOWN: - self.is_valid = False - return - - if self.checksum in [Checksums.OOT_NTSC_JP_MQ, Checksums.OOT_NTSC_US_MQ, Checksums.OOT_PAL_GC_MQ_DBG, Checksums.OOT_PAL_MQ]: - self.isMq = True - else: - self.isMq = False - - # get rom version - self.version = ROM_INFO_TABLE[self.checksum] - - def getDmaEntryByIndex(self, i): - return RomDmaEntry(self, i) - - def readDmaEntry(self, entry): - return self.rom_data[entry.physStart:entry.physStart + entry.size] - - @staticmethod - def isValidRom(rom_path): - return Z64Rom(rom_path).is_valid - - @staticmethod - def isMqRom(rom_path): - return Z64Rom(rom_path).isMq diff --git a/ZAPDTR b/ZAPDTR new file mode 160000 index 000000000..eff290361 --- /dev/null +++ b/ZAPDTR @@ -0,0 +1 @@ +Subproject commit eff29036118349e142ee8efca80fd975a2a2b6ff diff --git a/ZAPDTR/.clang-format b/ZAPDTR/.clang-format deleted file mode 100644 index 784e734e9..000000000 --- a/ZAPDTR/.clang-format +++ /dev/null @@ -1,84 +0,0 @@ ---- -AccessModifierOffset: -4 -AlignAfterOpenBracket: Align -AlignConsecutiveAssignments: false -AlignConsecutiveDeclarations: false -AlignEscapedNewlinesLeft: false -AlignOperands: true -AlignTrailingComments: true -AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine: false -AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: InlineOnly -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: true -BinPackArguments: true -BinPackParameters: true -BraceWrapping: - AfterCaseLabel: true - AfterClass: true - AfterControlStatement: true - AfterEnum: true - AfterFunction: true - AfterNamespace: true - AfterStruct: true - AfterUnion: true - BeforeCatch: true - BeforeElse: true - IndentBraces: false -BreakBeforeBinaryOperators: None -BreakBeforeBraces: Custom -BreakBeforeTernaryOperators: false -BreakConstructorInitializersBeforeComma: false -ColumnLimit: 100 -CommentPragmas: '^ (IWYU pragma:|NOLINT)' -ConstructorInitializerAllOnOneLineOrOnePerLine: false -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 4 -Cpp11BracedListStyle: true -DerivePointerAlignment: false -DisableFormat: false -ForEachMacros: [ ] -IncludeCategories: - - Regex: '^<[Ww]indows\.h>$' - Priority: 1 - - Regex: '^<' - Priority: 2 - - Regex: '^"' - Priority: 3 -IndentCaseLabels: false -IndentWidth: 4 -IndentWrappedFunctionNames: false -KeepEmptyLinesAtTheStartOfBlocks: false -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -PenaltyBreakBeforeFirstCallParameter: 19 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakString: 1000 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 60 -PointerAlignment: Left -ReflowComments: true -SortIncludes: true -SpaceAfterCStyleCast: false -SpaceBeforeAssignmentOperators: true -SpaceBeforeParens: ControlStatements -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 2 -SpacesInAngles: false -SpacesInContainerLiterals: true -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -Standard: Latest -TabWidth: 4 -UseTab: AlignWithSpaces -... - diff --git a/ZAPDTR/.gitignore b/ZAPDTR/.gitignore deleted file mode 100644 index 68c502e36..000000000 --- a/ZAPDTR/.gitignore +++ /dev/null @@ -1,341 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ -**/Properties/launchSettings.json - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -*.out -*.o -*.d -lib/libgfxd/libgfxd.a -ExporterTest/ExporterTest.a -ZAPDUtils/ZAPDUtils.a -.vscode/ -build/ -ZAPDUtils/build/ -ZAPD/BuildInfo.h diff --git a/ZAPDTR/.gitrepo b/ZAPDTR/.gitrepo deleted file mode 100644 index bf9a6491f..000000000 --- a/ZAPDTR/.gitrepo +++ /dev/null @@ -1,12 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme -; -[subrepo] - remote = https://github.com/harbourmasters/ZAPDTR - branch = master - commit = d4c35b90aed66eeed61066b4b76e488bfab52b4d - parent = 9d17e19a1dcf2b5c6cef0d3c93816f98a280eb58 - method = rebase - cmdver = 0.4.3 diff --git a/ZAPDTR/ExporterTest/CollisionExporter.cpp b/ZAPDTR/ExporterTest/CollisionExporter.cpp deleted file mode 100644 index c2167180d..000000000 --- a/ZAPDTR/ExporterTest/CollisionExporter.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "CollisionExporter.h" - -void ExporterExample_Collision::Save(ZResource* res, [[maybe_unused]] const fs::path& outPath, - BinaryWriter* writer) -{ - ZCollisionHeader* col = (ZCollisionHeader*)res; - - writer->Write(col->absMinX); - writer->Write(col->absMinY); - writer->Write(col->absMinZ); - - writer->Write(col->absMaxX); - writer->Write(col->absMaxY); - writer->Write(col->absMaxZ); - - writer->Write(col->numVerts); - writer->Write(col->vtxAddress); - - writer->Write(col->numPolygons); - writer->Write(col->polyAddress); - writer->Write(col->polyTypeDefAddress); - writer->Write(col->camDataAddress); - - writer->Write(col->numWaterBoxes); - writer->Write(col->waterBoxAddress); - - writer->Write(col->vtxSegmentOffset); - writer->Write(col->polySegmentOffset); - writer->Write(col->polyTypeDefSegmentOffset); - writer->Write(col->camDataSegmentOffset); - writer->Write(col->waterBoxSegmentOffset); - - uint32_t oldOffset = writer->GetBaseAddress(); - - writer->Seek(col->vtxSegmentOffset, SeekOffsetType::Start); - - for (uint16_t i = 0; i < col->vertices.size(); i++) - { - for (uint32_t j = 0; j < col->vertices[i].dimensions; j++) - { - writer->Write(col->vertices[i].scalars[j].scalarData.s16); - } - } - - writer->Seek(col->polySegmentOffset, SeekOffsetType::Start); - - for (uint16_t i = 0; i < col->polygons.size(); i++) - { - writer->Write(col->polygons[i].type); - writer->Write(col->polygons[i].vtxA); - writer->Write(col->polygons[i].vtxB); - writer->Write(col->polygons[i].vtxC); - writer->Write(col->polygons[i].normX); - writer->Write(col->polygons[i].normY); - writer->Write(col->polygons[i].normZ); - writer->Write(col->polygons[i].dist); - } - - writer->Seek(col->polyTypeDefSegmentOffset, SeekOffsetType::Start); - - for (const auto& poly : col->polygonTypes) - { - writer->Write(poly.data[0]); - writer->Write(poly.data[1]); - } - writer->Seek(col->camDataSegmentOffset, SeekOffsetType::Start); - - for (auto entry : col->camData->entries) - { - writer->Write(entry->cameraSType); - writer->Write(entry->numData); - writer->Write(entry->cameraPosDataSeg); - } - - writer->Seek(oldOffset, SeekOffsetType::Start); -} diff --git a/ZAPDTR/ExporterTest/CollisionExporter.h b/ZAPDTR/ExporterTest/CollisionExporter.h deleted file mode 100644 index 1dc50634e..000000000 --- a/ZAPDTR/ExporterTest/CollisionExporter.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "ZCollision.h" -#include "ZResource.h" - -class ExporterExample_Collision : public ZResourceExporter -{ -public: - void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/ZAPDTR/ExporterTest/ExporterTest.vcxproj b/ZAPDTR/ExporterTest/ExporterTest.vcxproj deleted file mode 100644 index 341f72ceb..000000000 --- a/ZAPDTR/ExporterTest/ExporterTest.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {65608eb0-1a47-45ad-ab66-192fb64c762c} - ExporterTest - 10.0 - ExporterExample - - - - Application - true - v142 - Unicode - - - Application - false - v143 - true - Unicode - - - StaticLibrary - true - v142 - Unicode - - - Application - false - v143 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - false - - - true - $(ProjectDir)..\ZAPD\;$(ProjectDir)..\ZAPDUtils;$(ProjectDir)..\lib\tinyxml2;$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\lib\elfio;$(ProjectDir)..\lib\stb;$(ProjectDir);$(IncludePath) - - - false - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreadedDebug - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ZAPDTR/ExporterTest/ExporterTest.vcxproj.filters b/ZAPDTR/ExporterTest/ExporterTest.vcxproj.filters deleted file mode 100644 index 166f563a1..000000000 --- a/ZAPDTR/ExporterTest/ExporterTest.vcxproj.filters +++ /dev/null @@ -1,42 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/ZAPDTR/ExporterTest/Main.cpp b/ZAPDTR/ExporterTest/Main.cpp deleted file mode 100644 index 07fdbeece..000000000 --- a/ZAPDTR/ExporterTest/Main.cpp +++ /dev/null @@ -1,79 +0,0 @@ -#include "CollisionExporter.h" -#include "Globals.h" -#include "RoomExporter.h" -#include "TextureExporter.h" - -enum class ExporterFileMode -{ - ModeExample1 = (int)ZFileMode::Custom + 1, - ModeExample2 = (int)ZFileMode::Custom + 2, - ModeExample3 = (int)ZFileMode::Custom + 3, -}; - -static void ExporterParseFileMode(const std::string& buildMode, ZFileMode& fileMode) -{ - if (buildMode == "me1") - fileMode = (ZFileMode)ExporterFileMode::ModeExample1; - else if (buildMode == "me2") - fileMode = (ZFileMode)ExporterFileMode::ModeExample2; - else if (buildMode == "me3") - fileMode = (ZFileMode)ExporterFileMode::ModeExample3; -} - -static void ExporterParseArgs([[maybe_unused]] int argc, char* argv[], int& i) -{ - std::string arg = argv[i]; - - if (arg == "--do-x") - { - } - else if (arg == "--do-y") - { - } -} - -static bool ExporterProcessFileMode(ZFileMode fileMode) -{ - // Do whatever work is associated with these custom file modes... - // Return true to indicate one of our own file modes is being processed - if (fileMode == (ZFileMode)ExporterFileMode::ModeExample1) - return true; - else if (fileMode == (ZFileMode)ExporterFileMode::ModeExample2) - return true; - else if (fileMode == (ZFileMode)ExporterFileMode::ModeExample3) - return true; - - return false; -} - -static void ExporterFileBegin(ZFile* file) -{ - printf("ExporterFileBegin() called on ZFile %s.\n", file->GetName().c_str()); -} - -static void ExporterFileEnd(ZFile* file) -{ - printf("ExporterFileEnd() called on ZFile %s.\n", file->GetName().c_str()); -} - -static void ImportExporters() -{ - // In this example we set up a new exporter called "EXAMPLE". - // By running ZAPD with the argument -se EXAMPLE, we tell it that we want to use this exporter - // for our resources. - ExporterSet* exporterSet = new ExporterSet(); - exporterSet->processFileModeFunc = ExporterProcessFileMode; - exporterSet->parseFileModeFunc = ExporterParseFileMode; - exporterSet->parseArgsFunc = ExporterParseArgs; - exporterSet->beginFileFunc = ExporterFileBegin; - exporterSet->endFileFunc = ExporterFileEnd; - exporterSet->exporters[ZResourceType::Texture] = new ExporterExample_Texture(); - exporterSet->exporters[ZResourceType::Room] = new ExporterExample_Room(); - exporterSet->exporters[ZResourceType::CollisionHeader] = new ExporterExample_Collision(); - - Globals::AddExporter("EXAMPLE", exporterSet); -} - -// When ZAPD starts up, it will automatically call the below function, which in turn sets up our -// exporters. -REGISTER_EXPORTER(ImportExporters); diff --git a/ZAPDTR/ExporterTest/Makefile b/ZAPDTR/ExporterTest/Makefile deleted file mode 100644 index 42033b7c0..000000000 --- a/ZAPDTR/ExporterTest/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# Only used for standalone compilation, usually inherits these from the main makefile -CXXFLAGS ?= -Wall -Wextra -O2 -g -std=c++17 - -SRC_DIRS := $(shell find . -type d -not -path "*build*") -CPP_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp)) -H_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.h)) - -O_FILES := $(foreach f,$(CPP_FILES:.cpp=.o),build/$f) -LIB := ExporterTest.a - -# create build directories -$(shell mkdir -p $(foreach dir,$(SRC_DIRS),build/$(dir))) - -all: $(LIB) - -clean: - rm -rf build $(LIB) - -format: - clang-format-11 -i $(CPP_FILES) $(H_FILES) - -.PHONY: all clean format - -build/%.o: %.cpp - $(CXX) $(CXXFLAGS) $(OPTFLAGS) -I ./ -I ../ZAPD -I ../ZAPDUtils -I ../lib/tinyxml2 -c $(OUTPUT_OPTION) $< - -$(LIB): $(O_FILES) - $(AR) rcs $@ $^ diff --git a/ZAPDTR/ExporterTest/RoomExporter.cpp b/ZAPDTR/ExporterTest/RoomExporter.cpp deleted file mode 100644 index e77f26485..000000000 --- a/ZAPDTR/ExporterTest/RoomExporter.cpp +++ /dev/null @@ -1,372 +0,0 @@ -#include "RoomExporter.h" -#include "CollisionExporter.h" -#include "Utils/BinaryWriter.h" -#include -#include "Utils/MemoryStream.h" -#include "ZRoom/Commands/SetCameraSettings.h" -#include "ZRoom/Commands/SetCollisionHeader.h" -#include "ZRoom/Commands/SetCsCamera.h" -#include "ZRoom/Commands/SetEchoSettings.h" -#include "ZRoom/Commands/SetEntranceList.h" -#include "ZRoom/Commands/SetLightingSettings.h" -#include "ZRoom/Commands/SetMesh.h" -#include "ZRoom/Commands/SetRoomBehavior.h" -#include "ZRoom/Commands/SetRoomList.h" -#include "ZRoom/Commands/SetSkyboxModifier.h" -#include "ZRoom/Commands/SetSkyboxSettings.h" -#include "ZRoom/Commands/SetSoundSettings.h" -#include "ZRoom/Commands/SetSpecialObjects.h" -#include "ZRoom/Commands/SetStartPositionList.h" -#include "ZRoom/Commands/SetTimeSettings.h" -#include "ZRoom/Commands/SetWind.h" - -void ExporterExample_Room::Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) -{ - ZRoom* room = dynamic_cast(res); - - // MemoryStream* memStream = new MemoryStream(); - // BinaryWriter* writer = new BinaryWriter(memStream); - - for (size_t i = 0; i < room->commands.size() * 8; i++) - writer->Write((uint8_t)0); - - for (size_t i = 0; i < room->commands.size(); i++) - { - ZRoomCommand* cmd = room->commands[i]; - - writer->Seek(i * 8, SeekOffsetType::Start); - - writer->Write((uint8_t)cmd->cmdID); - - switch (cmd->cmdID) - { - case RoomCommand::SetWind: - { - SetWind* cmdSetWind = (SetWind*)cmd; - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write(cmdSetWind->windWest); // 0x04 - writer->Write(cmdSetWind->windVertical); // 0x05 - writer->Write(cmdSetWind->windSouth); // 0x06 - writer->Write(cmdSetWind->clothFlappingStrength); // 0x07 - } - break; - case RoomCommand::SetTimeSettings: - { - SetTimeSettings* cmdTime = (SetTimeSettings*)cmd; - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write(cmdTime->hour); // 0x04 - writer->Write(cmdTime->min); // 0x05 - writer->Write(cmdTime->unk); // 0x06 - writer->Write((uint8_t)0); // 0x07 - } - break; - case RoomCommand::SetSkyboxModifier: - { - SetSkyboxModifier* cmdSkybox = (SetSkyboxModifier*)cmd; - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write(cmdSkybox->disableSky); // 0x04 - writer->Write(cmdSkybox->disableSunMoon); // 0x05 - writer->Write((uint8_t)0); // 0x06 - writer->Write((uint8_t)0); // 0x07 - } - break; - case RoomCommand::SetEchoSettings: - { - SetEchoSettings* cmdEcho = (SetEchoSettings*)cmd; - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)0); // 0x04 - writer->Write((uint8_t)0); // 0x05 - writer->Write((uint8_t)0); // 0x06 - writer->Write((uint8_t)cmdEcho->echo); // 0x07 - } - break; - case RoomCommand::SetSoundSettings: - { - SetSoundSettings* cmdSound = (SetSoundSettings*)cmd; - - writer->Write((uint8_t)cmdSound->reverb); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)0); // 0x04 - writer->Write((uint8_t)0); // 0x05 - - writer->Write(cmdSound->nightTimeSFX); // 0x06 - writer->Write(cmdSound->musicSequence); // 0x07 - } - break; - case RoomCommand::SetSkyboxSettings: - { - SetSkyboxSettings* cmdSkybox = (SetSkyboxSettings*)cmd; - - writer->Write((uint8_t)cmdSkybox->unk1); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)cmdSkybox->skyboxNumber); // 0x04 - writer->Write((uint8_t)cmdSkybox->cloudsType); // 0x05 - writer->Write((uint8_t)cmdSkybox->isIndoors); // 0x06 - } - break; - case RoomCommand::SetRoomBehavior: - { - SetRoomBehavior* cmdRoom = (SetRoomBehavior*)cmd; - - writer->Write((uint8_t)cmdRoom->gameplayFlags); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(cmdRoom->gameplayFlags2); // 0x04 - } - break; - case RoomCommand::SetCsCamera: - { - SetCsCamera* cmdCsCam = (SetCsCamera*)cmd; - - writer->Write((uint8_t)cmdCsCam->cameras.size()); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write(cmdCsCam->segmentOffset); // 0x04 - } - break; - case RoomCommand::SetMesh: - { - SetMesh* cmdMesh = (SetMesh*)cmd; - - int baseStreamEnd = writer->GetStream().get()->GetLength(); - - writer->Write((uint8_t)cmdMesh->data); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - writer->Write(baseStreamEnd); // 0x04 - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(baseStreamEnd, SeekOffsetType::Start); - - // TODO: NOT DONE - - writer->Write(cmdMesh->meshHeaderType); - - if (cmdMesh->meshHeaderType == 0) - { - // writer->Write(cmdMesh->) - } - else if (cmdMesh->meshHeaderType == 1) - { - } - else if (cmdMesh->meshHeaderType == 2) - { - } - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::SetCameraSettings: - { - SetCameraSettings* cmdCam = (SetCameraSettings*)cmd; - - writer->Write((uint8_t)cmdCam->cameraMovement); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(cmdCam->mapHighlight); // 0x04 - } - break; - case RoomCommand::SetLightingSettings: - { - SetLightingSettings* cmdLight = (SetLightingSettings*)cmd; - - writer->Write((uint8_t)cmdLight->settings.size()); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(cmdLight->segmentOffset); // 0x04 - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(cmdLight->segmentOffset, SeekOffsetType::Start); - - for (LightingSettings setting : cmdLight->settings) - { - writer->Write(setting.ambientClrR); - writer->Write(setting.ambientClrG); - writer->Write(setting.ambientClrB); - - writer->Write(setting.diffuseClrA_R); - writer->Write(setting.diffuseClrA_G); - writer->Write(setting.diffuseClrA_B); - - writer->Write(setting.diffuseDirA_X); - writer->Write(setting.diffuseDirA_Y); - writer->Write(setting.diffuseDirA_Z); - - writer->Write(setting.diffuseClrB_R); - writer->Write(setting.diffuseClrB_G); - writer->Write(setting.diffuseClrB_B); - - writer->Write(setting.diffuseDirB_X); - writer->Write(setting.diffuseDirB_Y); - writer->Write(setting.diffuseDirB_Z); - - writer->Write(setting.fogClrR); - writer->Write(setting.fogClrG); - writer->Write(setting.fogClrB); - - writer->Write(setting.unk); - writer->Write(setting.drawDistance); - } - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::SetRoomList: - { - SetRoomList* cmdRoom = (SetRoomList*)cmd; - - writer->Write((uint8_t)cmdRoom->romfile->rooms.size()); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - - auto baseStreamEnd = writer->GetLength(); - writer->Write(baseStreamEnd); // 0x04 - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(baseStreamEnd, SeekOffsetType::Start); - - for (const auto& entry : cmdRoom->romfile->rooms) - { - writer->Write(entry.virtualAddressStart); - writer->Write(entry.virtualAddressEnd); - } - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::SetCollisionHeader: - { - SetCollisionHeader* cmdCollHeader = (SetCollisionHeader*)cmd; - - int streamEnd = writer->GetStream().get()->GetLength(); - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(streamEnd); // 0x04 - - // TODO: NOT DONE - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(streamEnd, SeekOffsetType::Start); - - ExporterExample_Collision colExp = ExporterExample_Collision(); - - colExp.Save(cmdCollHeader->collisionHeader, outPath, writer); - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::SetEntranceList: - { - SetEntranceList* cmdEntrance = (SetEntranceList*)cmd; - - uint32_t baseStreamEnd = writer->GetStream().get()->GetLength(); - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(baseStreamEnd); // 0x04 - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(baseStreamEnd, SeekOffsetType::Start); - - for (EntranceEntry entry : cmdEntrance->entrances) - { - writer->Write((uint8_t)entry.startPositionIndex); - writer->Write((uint8_t)entry.roomToLoad); - } - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::SetSpecialObjects: - { - SetSpecialObjects* cmdSpecObj = (SetSpecialObjects*)cmd; - - writer->Write((uint8_t)cmdSpecObj->elfMessage); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)0); // 0x04 - writer->Write((uint8_t)0); // 0x05 - writer->Write((uint16_t)cmdSpecObj->globalObject); // 0x06 - } - break; - case RoomCommand::SetStartPositionList: - { - SetStartPositionList* cmdStartPos = (SetStartPositionList*)cmd; - - uint32_t baseStreamEnd = writer->GetStream().get()->GetLength(); - - writer->Write((uint8_t)cmdStartPos->actors.size()); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write(baseStreamEnd); // 0x04 - - uint32_t oldOffset = writer->GetBaseAddress(); - writer->Seek(baseStreamEnd, SeekOffsetType::Start); - - for (ActorSpawnEntry entry : cmdStartPos->actors) - { - writer->Write(entry.actorNum); - writer->Write(entry.posX); - writer->Write(entry.posY); - writer->Write(entry.posZ); - writer->Write(entry.rotX); - writer->Write(entry.rotY); - writer->Write(entry.rotZ); - writer->Write(entry.params); - } - - writer->Seek(oldOffset, SeekOffsetType::Start); - } - break; - case RoomCommand::EndMarker: - { - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)0); // 0x04 - writer->Write((uint8_t)0); // 0x05 - writer->Write((uint8_t)0); // 0x06 - writer->Write((uint8_t)0); // 0x07 - } - break; - default: - printf("UNIMPLEMENTED COMMAND: %i\n", (int)cmd->cmdID); - - writer->Write((uint8_t)0); // 0x01 - writer->Write((uint8_t)0); // 0x02 - writer->Write((uint8_t)0); // 0x03 - writer->Write((uint8_t)0); // 0x04 - writer->Write((uint8_t)0); // 0x05 - writer->Write((uint8_t)0); // 0x06 - writer->Write((uint8_t)0); // 0x07 - - break; - } - } - - // writer->Close(); - // DiskFile::WriteAllBytes(StringHelper::Sprintf("%s", res->GetName().c_str()), - // memStream->ToVector()); -} diff --git a/ZAPDTR/ExporterTest/RoomExporter.h b/ZAPDTR/ExporterTest/RoomExporter.h deleted file mode 100644 index d8f7eae01..000000000 --- a/ZAPDTR/ExporterTest/RoomExporter.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZRoom/ZRoom.h" - -class ExporterExample_Room : public ZResourceExporter -{ -public: - void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/ZAPDTR/ExporterTest/TextureExporter.cpp b/ZAPDTR/ExporterTest/TextureExporter.cpp deleted file mode 100644 index 58d0964d3..000000000 --- a/ZAPDTR/ExporterTest/TextureExporter.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "TextureExporter.h" -#include "../ZAPD/ZFile.h" - -void ExporterExample_Texture::Save(ZResource* res, [[maybe_unused]] const fs::path& outPath, - BinaryWriter* writer) -{ - ZTexture* tex = (ZTexture*)res; - - auto data = tex->parent->GetRawData(); - - for (offset_t i = tex->GetRawDataIndex(); i < tex->GetRawDataIndex() + tex->GetRawDataSize(); - i++) - writer->Write(data[i]); -} diff --git a/ZAPDTR/ExporterTest/TextureExporter.h b/ZAPDTR/ExporterTest/TextureExporter.h deleted file mode 100644 index f3922cac1..000000000 --- a/ZAPDTR/ExporterTest/TextureExporter.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "Utils/BinaryWriter.h" -#include "ZResource.h" -#include "ZTexture.h" - -class ExporterExample_Texture : public ZResourceExporter -{ -public: - void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) override; -}; \ No newline at end of file diff --git a/ZAPDTR/LICENSE b/ZAPDTR/LICENSE deleted file mode 100644 index 90b734bde..000000000 --- a/ZAPDTR/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 Zelda Reverse Engineering Team - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/ZAPDTR/Makefile b/ZAPDTR/Makefile deleted file mode 100644 index e725f94f8..000000000 --- a/ZAPDTR/Makefile +++ /dev/null @@ -1,134 +0,0 @@ -# use variables in submakes -export -OPTIMIZATION_ON ?= 1 -ASAN ?= 0 -DEPRECATION_ON ?= 1 -DEBUG ?= 0 -COPYCHECK_ARGS ?= -LLD ?= 0 -WERROR ?= 0 - -# Use clang++ if available, else use g++ -ifeq ($(shell command -v clang++ >/dev/null 2>&1; echo $$?),0) - CXX := clang++ -else - CXX := g++ -endif - -INC := -I ZAPD -I lib/libgfxd -I lib/tinyxml2 -I ZAPDUtils -CXXFLAGS := -fpic -std=c++17 -Wall -Wextra -fno-omit-frame-pointer -OPTFLAGS := - -ifneq ($(DEBUG),0) - OPTIMIZATION_ON = 0 - CXXFLAGS += -g3 -DDEVELOPMENT -D_DEBUG - COPYCHECK_ARGS += --devel - DEPRECATION_ON = 0 -endif - -ifneq ($(WERROR),0) - CXXFLAGS += -Werror -endif - -ifeq ($(OPTIMIZATION_ON),0) - OPTFLAGS := -O0 -else - OPTFLAGS := -O2 -endif - -ifneq ($(ASAN),0) - CXXFLAGS += -fsanitize=address -fsanitize=pointer-compare -fsanitize=pointer-subtract -fsanitize=undefined -endif -ifneq ($(DEPRECATION_ON),0) - CXXFLAGS += -DDEPRECATION_ON -endif -# CXXFLAGS += -DTEXTURE_DEBUG - -LDFLAGS := -lm -ldl -lpng - -# Use LLD if available. Set LLD=0 to not use it -ifeq ($(shell command -v ld.lld >/dev/null 2>&1; echo $$?),0) - LLD := 1 -endif - -ifneq ($(LLD),0) - LDFLAGS += -fuse-ld=lld -endif - -UNAME := $(shell uname) -UNAMEM := $(shell uname -m) -ifneq ($(UNAME), Darwin) - LDFLAGS += -Wl,-export-dynamic -lstdc++fs - EXPORTERS := -Wl,--whole-archive ExporterTest/ExporterTest.a -Wl,--no-whole-archive -else - EXPORTERS := -Wl,-force_load ExporterTest/ExporterTest.a - ifeq ($(UNAMEM),arm64) - ifeq ($(shell brew list libpng > /dev/null 2>&1; echo $$?),0) - LDFLAGS += -L $(shell brew --prefix)/lib - INC += -I $(shell brew --prefix)/include - else - $(error Please install libpng via Homebrew) - endif - endif -endif - - -ZAPD_SRC_DIRS := $(shell find ZAPD -type d) -SRC_DIRS = $(ZAPD_SRC_DIRS) lib/tinyxml2 - -ZAPD_CPP_FILES := $(foreach dir,$(ZAPD_SRC_DIRS),$(wildcard $(dir)/*.cpp)) -ZAPD_H_FILES := $(foreach dir,$(ZAPD_SRC_DIRS),$(wildcard $(dir)/*.h)) - -CPP_FILES += $(ZAPD_CPP_FILES) lib/tinyxml2/tinyxml2.cpp -O_FILES := $(foreach f,$(CPP_FILES:.cpp=.o),build/$f) -O_FILES += build/ZAPD/BuildInfo.o - -# create build directories -$(shell mkdir -p $(foreach dir,$(SRC_DIRS),build/$(dir))) - - -# Main targets -all: ZAPD.out copycheck - -build/ZAPD/BuildInfo.o: - python3 ZAPD/genbuildinfo.py $(COPYCHECK_ARGS) - $(CXX) $(CXXFLAGS) $(OPTFLAGS) $(INC) -c $(OUTPUT_OPTION) build/ZAPD/BuildInfo.cpp - -copycheck: ZAPD.out - python3 copycheck.py - -clean: - rm -rf build ZAPD.out - $(MAKE) -C lib/libgfxd clean - $(MAKE) -C ZAPDUtils clean - $(MAKE) -C ExporterTest clean - -rebuild: clean all - -format: - clang-format-11 -i $(ZAPD_CPP_FILES) $(ZAPD_H_FILES) - $(MAKE) -C ZAPDUtils format - $(MAKE) -C ExporterTest format - -.PHONY: all build/ZAPD/BuildInfo.o copycheck clean rebuild format - -build/%.o: %.cpp - $(CXX) $(CXXFLAGS) $(OPTFLAGS) $(INC) -c $(OUTPUT_OPTION) $< - - -# Submakes -lib/libgfxd/libgfxd.a: - $(MAKE) -C lib/libgfxd - -.PHONY: ExporterTest -ExporterTest: - $(MAKE) -C ExporterTest - -.PHONY: ZAPDUtils -ZAPDUtils: - $(MAKE) -C ZAPDUtils - - -# Linking -ZAPD.out: $(O_FILES) lib/libgfxd/libgfxd.a ExporterTest ZAPDUtils - $(CXX) $(CXXFLAGS) $(O_FILES) lib/libgfxd/libgfxd.a ZAPDUtils/ZAPDUtils.a $(EXPORTERS) $(LDFLAGS) $(OUTPUT_OPTION) diff --git a/ZAPDTR/README.md b/ZAPDTR/README.md deleted file mode 100644 index bb96bab1b..000000000 --- a/ZAPDTR/README.md +++ /dev/null @@ -1,163 +0,0 @@ -# ZAPD: Zelda Asset Processor for Decomp - -## Compiling - -### Dependencies - -ZAPD needs a compiler with C++17 support. - -ZAPD has the following library dependencies: - -- `libpng` - -In a Debian/Ubuntu based environment, those could be installed with the following command: - -```bash -sudo apt install libpng-dev -``` - -On a Mac, you will need to install libpng with Homebrew or MacPorts; we currently only support Homebrew. You can run - -```bash -brew install libpng -``` - -to install it via Homebrew. - -### Building - -#### Linux / *nix - -ZAPD uses the clasic `Makefile` approach. To build just run `make` (or even better `make -j` for faster compilations). - -You can configure a bit your ZAPD build with the following options: - -- `OPTIMIZATION_ON`: If set to `0` optimizations will be disabled (compile with `-O0`). Any other value compiles with `-O2`. Defaults to `1`. -- `ASAN`: If it is set to a non-zero then ZAPD will be compiled with Address Sanitizer enabled (`-fsanitize=address`). Defaults to `0`. -- `DEPRECATION_ON`: If it is set to a zero then deprecation warnings will be disabled. Defaults to `1`. -- `DEBUG`: If non-zero, ZAPD will be compiled in _development mode_. This implies the following: - - Debugging symbols enabled (`-g3`). They are disabled by default. - - `OPTIMIZATION_ON=0`: Disables optimizations (`-O0`). - - `DEPRECATION_ON=0`: Disables deprecation warnings. -- `LLD=1`: builds with the LLVM linker `ld.lld` instead of the system default. - -As an example, if you want to build ZAPD with optimizations disabled and use the address sanitizer, you could use the following command: - -```bash -make -j OPTIMIZATION_ON=0 ASAN=1 -``` - -#### Windows - -This repository contains `vcxproj` files for compiling under Visual Studio environments. See `ZAPD/ZAPD.vcxproj`. - -## Invoking ZAPD - -ZAPD needs a _File parsing mode_ to be passed as first parameter. The options are: - -- `e`: "Extraction" mode. - - In this mode, ZAPD expects a XML file as input, a folder as ouput and a path to the baserom files. - - ZAPD will read the XML and use it as a guide to extract the contents of the specified asset file from the baserom folder. - - For more info of the format of those XMLs, see the [ZAPD extraction XML reference](docs/zapd_extraction_xml_reference.md). -- `bsf`: "Build source file" mode. - - This is an experimental mode. - - It was going to be used to let you have XMLs that aren't just for extraction. Might get used, might not. Still need to experiment on that. -- `btex`: "Build texture" mode. - - In this mode, ZAPD expects a PNG file as input, a filename as ouput and a texture type parameter (`-tt`). - - ZAPD will try to convert the given PNG into the contents of a `uint64_t` C array. -- `bren`: "Build (render) background" mode. - - In this mode, ZAPD expects a JPG file as input and a filename as ouput. - - ZAPD will try to convert the given JPG into the contents of a `uint64_t` C array. -- `blb`: "Build blob" mode. - - In this mode, ZAPD expects a BIN file as input and a filename as ouput. - - ZAPD will try to convert the given BIN into the contents of a `uint8_t` C array. - -ZAPD also accepts the following list of extra parameters: - -- `-i PATH` / `--inputpath PATH`: Set input path. -- `-o PATH` / `--outputpath PATH`: Set output path. -- `-b PATH` / `--baserompath`: Set baserom path. - - Can be used only in `e` or `bsf` modes. -- `-osf PATH`: Set source output path. This is the path where the `.c` and `.h` files will be extracted to. If omitted, it will use the value passed to `--outputpath` parameter. -- `-gsf MODE`: Generate source file during extraction. If `MODE` is `1`, C source files will be generated. - - Can be used only in `e` mode. -- `-crc` / `--output-crc`: Outputs a CRC file for each extracted texture. - - Can be used only in `e` or `bsf` modes. -- `-ulzdl MODE`: Use "Legacy ZDisplayList" instead of `libgfxd`. Set `MODE` to `1` to enable it. - - Can be used only in `e` or `bsf` modes. -- `-profile MODE`: Enable profiling. Set `MODE` to `1` to enable it. -- `-uer MODE`: Split resources into their individual components (enabled by default). Set `MODE` to non-`1` to disable it. -- `-tt TYPE`: Set texture type. - - Can be used only in mode `btex`. - - Valid values: - - `rgba32` - - `rgb5a1` - - `i4` - - `i8` - - `ia4` - - `ia8` - - `ia16` - - `ci4` - - `ci8` -- `-rconf PATH` Read Config File. -- `-eh`: Enable error handler. - - Only available in non-Windows environments. -- `-v MODE`: Enable verbosity. Currently there are 3 possible values: - - `0`: Default. Completely silent (except for warnings and errors). - - `1`: Information. - - `2` (and higher): Debug. -- `-wu` / `--warn-unaccounted`: Enable warnings for each unaccounted block of data found. - - Can be used only in `e` or `bsf` modes. -- `-vu` / `--verbose-unaccounted`: Changes how unaccounteds are outputted. Max 4 bytes per line (a word) and add a comment with the offset of each of those lines. - - Could be useful for looking at raw data or testing. - - Can be used only in `e` or `bsf` modes. -- `-tm MODE`: Test Mode (enables certain experimental features). To enable it, set `MODE` to `1`. -- `-se` / `--set-exporter` : Sets which exporter to use. -- `--gcc-compat` : Enables GCC compatibly mode. Slower. -- `-us` / `--unaccounted-static` : Mark unaccounted data as `static` -- `-s` / `--static` : Mark every asset as `static`. - - This behaviour can be overridden per asset using `Static=` in the respective XML node. -- `-W...`: warning flags, see below - -Additionally, you can pass the flag `--version` to see the current ZAPD version. If that flag is passed, ZAPD will ignore any other parameter passed. - -### Warning flags - -ZAPD contains a variety of warning types, with similar syntax to GCC or Clang's compiler warnings. Warnings can have three levels: - -- Off (does not display anything) -- Warn (print a warning but continue processing) -- Err (behave like an error, i.e. print and throw an exception to crash ZAPD when occurs) - -Each warning type uses one of these by default, but can be modified with flags, similarly to GCC or Clang: - -- `-Wfoo` enables warnings of type `foo` -- `-Wno-foo` disables warnings of type `foo` -- `-Werror=foo` escalates `foo` to behave like an error -- `-Weverything` enables all warnings (they may be turned off using `-Wno-` flags afterwards) -- `-Werror` escalates all enabled warnings to errors - -All warning types currently implemented, with their default levels: - -| Warning type | Default level | Description | -| --------------------------- | ------------- | ------------------------------------------------------------------------ | -| `-Wdeprecated` | Warn | Deprecated features | -| `-Whardcoded-pointer` | Warn | ZAPD lacks the info to make a symbol, so must output a hardcoded pointer | -| `-Wintersection` | Warn | Two assets intersect | -| `-Winvalid-attribute-value` | Err | Attribute declared in XML is wrong | -| `-Winvalid-extracted-data` | Err | Extracted data does not have correct form | -| `-Winvalid-jpeg` | Err | JPEG file does not conform to the game's format requirements | -| `-Winvalid-png` | Err | Issues arising when processing PNG data | -| `-Winvalid-xml` | Err | XML has syntax errors | -| `-Wmissing-attribute` | Warn | Required attribute missing in XML tag | -| `-Wmissing-offsets` | Warn | Offset attribute missing in XML tag | -| `-Wmissing-segment` | Warn | Segment not given in File tag in XML | -| `-Wnot-implemented` | Warn | ZAPD does not currently support this feature | -| `-Wunaccounted` | Off | Large blocks of unaccounted | -| `-Wunknown-attribute` | Warn | Unknown attribute in XML entry tag | - -There are also errors that do not have a type, and cannot be disabled. - -For example, here we have invoked ZAPD in the usual way to extract using a (rather badly-written) XML, but escalating `-Wintersection` to an error: - -![ZAPD warnings example](docs/zapd_warning_example.png?raw=true) diff --git a/ZAPDTR/ZAPD/CMakeLists.txt b/ZAPDTR/ZAPD/CMakeLists.txt deleted file mode 100644 index 96c42d00c..000000000 --- a/ZAPDTR/ZAPD/CMakeLists.txt +++ /dev/null @@ -1,497 +0,0 @@ -set(PROJECT_NAME ZAPDLib) - -set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use") -#set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use") -set(CMAKE_C_STANDARD 11) - -################################################################################ -# Source groups -################################################################################ -set(Header_Files - "../lib/tinyxml2/tinyxml2.h" - "CRC32.h" - "Declaration.h" - "FileWorker.h" - "GameConfig.h" - "Globals.h" - "ImageBackend.h" - "OutputFormatter.h" - "WarningHandler.h" - "CrashHandler.h" -) -source_group("Header Files" FILES ${Header_Files}) - -set(Header_Files__Libraries - "../../libultraship/extern/stb/stb_image.h" - "../../libultraship/extern/stb/stb_image_write.h" - "ctpl_stl.h" -) -source_group("Header Files\\Libraries" FILES ${Header_Files__Libraries}) - -set(Header_Files__Libraries__libgfxd - "../lib/libgfxd/gbi.h" - "../lib/libgfxd/gfxd.h" - "../lib/libgfxd/priv.h" -) -source_group("Header Files\\Libraries\\libgfxd" FILES ${Header_Files__Libraries__libgfxd}) - -set(Header_Files__Yaz0 - "yaz0/readwrite.h" - "yaz0/yaz0.h" -) -source_group("Header Files\\Yaz0" FILES ${Header_Files__Yaz0}) - -set(Header_Files__Z64 - "OtherStructs/SkinLimbStructs.h" - "OtherStructs/CutsceneMM_Commands.h" - "OtherStructs/Cutscene_Commands.h" - "ZAnimation.h" - "ZActorList.h" - "ZArray.h" - "ZAudio.h" - "ZBackground.h" - "ZBlob.h" - "ZCollision.h" - "ZCollisionPoly.h" - "ZCutscene.h" - "ZDisplayList.h" - "ZFile.h" - "ZLimb.h" - "ZMtx.h" - "ZPath.h" - "ZPlayerAnimationData.h" - "ZResource.h" - "ZRom.h" - "ZScalar.h" - "ZSkeleton.h" - "ZSurfaceType.h" - "ZString.h" - "ZSymbol.h" - "ZText.h" - "ZTexture.h" - "ZTextureAnimation.h" - "ZVector.h" - "ZVtx.h" -) -source_group("Header Files\\Z64" FILES ${Header_Files__Z64}) - -set(Header_Files__Z64__ZRoom - "ZRoom/ZRoom.h" - "ZRoom/ZRoomCommand.h" -) -source_group("Header Files\\Z64\\ZRoom" FILES ${Header_Files__Z64__ZRoom}) - -set(Header_Files__Z64__ZRoom__Commands - "ZRoom/Commands/EndMarker.h" - "ZRoom/Commands/SetActorCutsceneList.h" - "ZRoom/Commands/SetActorList.h" - "ZRoom/Commands/SetAlternateHeaders.h" - "ZRoom/Commands/SetAnimatedMaterialList.h" - "ZRoom/Commands/SetCameraSettings.h" - "ZRoom/Commands/SetCollisionHeader.h" - "ZRoom/Commands/SetCsCamera.h" - "ZRoom/Commands/SetCutscenes.h" - "ZRoom/Commands/SetEchoSettings.h" - "ZRoom/Commands/SetEntranceList.h" - "ZRoom/Commands/SetExitList.h" - "ZRoom/Commands/SetLightingSettings.h" - "ZRoom/Commands/SetLightList.h" - "ZRoom/Commands/SetMesh.h" - "ZRoom/Commands/SetMinimapChests.h" - "ZRoom/Commands/SetMinimapList.h" - "ZRoom/Commands/SetObjectList.h" - "ZRoom/Commands/SetPathways.h" - "ZRoom/Commands/SetRoomBehavior.h" - "ZRoom/Commands/SetRoomList.h" - "ZRoom/Commands/SetSkyboxModifier.h" - "ZRoom/Commands/SetSkyboxSettings.h" - "ZRoom/Commands/SetSoundSettings.h" - "ZRoom/Commands/SetSpecialObjects.h" - "ZRoom/Commands/SetStartPositionList.h" - "ZRoom/Commands/SetTimeSettings.h" - "ZRoom/Commands/SetTransitionActorList.h" - "ZRoom/Commands/SetWind.h" - "ZRoom/Commands/SetWorldMapVisited.h" - "ZRoom/Commands/Unused09.h" - "ZRoom/Commands/Unused1D.h" - "ZRoom/Commands/ZRoomCommandUnk.h" -) -source_group("Header Files\\Z64\\ZRoom\\Commands" FILES ${Header_Files__Z64__ZRoom__Commands}) - -set(Resource_Files - "../../OTRExporter/CFG/SymbolMap_OoTMqDbg.txt" -) -source_group("Resource Files" FILES ${Resource_Files}) - -set(Source_Files - "CrashHandler.cpp" - "Declaration.cpp" - "FileWorker.cpp" - "GameConfig.cpp" - "Globals.cpp" - "ImageBackend.cpp" - "Main.cpp" - "OutputFormatter.cpp" - "WarningHandler.cpp" -) -source_group("Source Files" FILES ${Source_Files}) - -set(Source_Files__Libraries__libgfxd - "../lib/libgfxd/gfxd.c" - "../lib/libgfxd/uc.c" - "../lib/libgfxd/uc_f3d.c" - "../lib/libgfxd/uc_f3db.c" - "../lib/libgfxd/uc_f3dex.c" - "../lib/libgfxd/uc_f3dex2.c" - "../lib/libgfxd/uc_f3dexb.c" -) -source_group("Source Files\\Libraries\\libgfxd" FILES ${Source_Files__Libraries__libgfxd}) - -set(Source_Files__Yaz0 - "yaz0/yaz0.cpp" -) -source_group("Source Files\\Yaz0" FILES ${Source_Files__Yaz0}) - -set(Source_Files__Z64 - "OtherStructs/SkinLimbStructs.cpp" - "OtherStructs/CutsceneMM_Commands.cpp" - "OtherStructs/Cutscene_Commands.cpp" - "ZAnimation.cpp" - "ZActorList.cpp" - "ZArray.cpp" - "ZAudio.cpp" - "ZAudioDecode.cpp" - "ZBackground.cpp" - "ZBlob.cpp" - "ZCollision.cpp" - "ZCollisionPoly.cpp" - "ZCutscene.cpp" - "ZDisplayList.cpp" - "ZFile.cpp" - "ZLimb.cpp" - "ZMtx.cpp" - "ZPath.cpp" - "ZPlayerAnimationData.cpp" - "ZResource.cpp" - "ZRom.cpp" - "ZScalar.cpp" - "ZSkeleton.cpp" - "ZSurfaceType.cpp" - "ZString.cpp" - "ZSymbol.cpp" - "ZText.cpp" - "ZTexture.cpp" - "ZTextureAnimation.cpp" - "ZVector.cpp" - "ZVtx.cpp" -) -source_group("Source Files\\Z64" FILES ${Source_Files__Z64}) - -set(Source_Files__Z64__ZRoom - "ZRoom/ZRoom.cpp" - "ZRoom/ZRoomCommand.cpp" -) -source_group("Source Files\\Z64\\ZRoom" FILES ${Source_Files__Z64__ZRoom}) - -set(Source_Files__Z64__ZRoom__Commands - "ZRoom/Commands/EndMarker.cpp" - "ZRoom/Commands/SetActorCutsceneList.cpp" - "ZRoom/Commands/SetActorList.cpp" - "ZRoom/Commands/SetAlternateHeaders.cpp" - "ZRoom/Commands/SetAnimatedMaterialList.cpp" - "ZRoom/Commands/SetCameraSettings.cpp" - "ZRoom/Commands/SetCollisionHeader.cpp" - "ZRoom/Commands/SetCsCamera.cpp" - "ZRoom/Commands/SetCutscenes.cpp" - "ZRoom/Commands/SetEchoSettings.cpp" - "ZRoom/Commands/SetEntranceList.cpp" - "ZRoom/Commands/SetExitList.cpp" - "ZRoom/Commands/SetLightingSettings.cpp" - "ZRoom/Commands/SetLightList.cpp" - "ZRoom/Commands/SetMesh.cpp" - "ZRoom/Commands/SetMinimapChests.cpp" - "ZRoom/Commands/SetMinimapList.cpp" - "ZRoom/Commands/SetObjectList.cpp" - "ZRoom/Commands/SetPathways.cpp" - "ZRoom/Commands/SetRoomBehavior.cpp" - "ZRoom/Commands/SetRoomList.cpp" - "ZRoom/Commands/SetSkyboxModifier.cpp" - "ZRoom/Commands/SetSkyboxSettings.cpp" - "ZRoom/Commands/SetSoundSettings.cpp" - "ZRoom/Commands/SetSpecialObjects.cpp" - "ZRoom/Commands/SetStartPositionList.cpp" - "ZRoom/Commands/SetTimeSettings.cpp" - "ZRoom/Commands/SetTransitionActorList.cpp" - "ZRoom/Commands/SetWind.cpp" - "ZRoom/Commands/SetWorldMapVisited.cpp" - "ZRoom/Commands/Unused09.cpp" - "ZRoom/Commands/Unused1D.cpp" - "ZRoom/Commands/ZRoomCommandUnk.cpp" -) -source_group("Source Files\\Z64\\ZRoom\\Commands" FILES ${Source_Files__Z64__ZRoom__Commands}) - -set(ALL_FILES - ${Header_Files} - ${Header_Files__Libraries} - ${Header_Files__Libraries__libgfxd} - ${Header_Files__Yaz0} - ${Header_Files__Z64} - ${Header_Files__Z64__ZRoom} - ${Header_Files__Z64__ZRoom__Commands} - ${Resource_Files} - ${Source_Files} - ${Source_Files__Libraries__libgfxd} - ${Source_Files__Yaz0} - ${Source_Files__Z64} - ${Source_Files__Z64__ZRoom} - ${Source_Files__Z64__ZRoom__Commands} - ${any__any} -) - -################################################################################ -# Target -################################################################################ - -add_library(${PROJECT_NAME} STATIC ${ALL_FILES}) - -add_executable(ZAPD ExecutableMain.cpp) -target_link_libraries(ZAPD ${PROJECT_NAME}) - - - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") -use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}") -use_props(ZAPD "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}") -endif() -################################################################################ -# Includes for CMake from *.props -################################################################################ - -set(ROOT_NAMESPACE ZAPD) - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - endif() -elseif (CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin") - set_target_properties(ZAPD PROPERTIES - OUTPUT_NAME "ZAPD.out" - ) -endif() -################################################################################ -# MSVC runtime library -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") -foreach(ZTarget ${PROJECT_NAME} ZAPD) - get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${ZTarget} PROPERTY MSVC_RUNTIME_LIBRARY) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" - $<$: - MultiThreadedDebug - > - $<$: - MultiThreaded - > - $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> - ) - endif() - set_target_properties(${ZTarget} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR}) -endforeach() -endif() -################################################################################ -# Compile definitions -################################################################################ -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "_CRT_SECURE_NO_WARNINGS;" - "_MBCS" - STORMLIB_NO_AUTO_LINK - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_CRT_SECURE_NO_WARNINGS" - ">" - "_MBCS" - STORMLIB_NO_AUTO_LINK - ) - endif() -endif() - -################################################################################ -# Compile and link options -################################################################################ - -if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(CMAKE_FIND_FRAMEWORK LAST) -endif() -find_package(PNG REQUIRED) - -target_include_directories(${PROJECT_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/extern/ZAPDUtils - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/src/resource - ${CMAKE_CURRENT_SOURCE_DIR}/../../libultraship/include - ${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/tinyxml2 - ${CMAKE_CURRENT_SOURCE_DIR}/../../ZAPDTR/lib/libgfxd - ${PNG_PNG_INCLUDE_DIR}/ - . - ) - -if(MSVC) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /Od; - /RTC1 - > - $<$: - /Oi; - /Gy - > - /permissive-; - /sdl; - /W3; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /Od - > - $<$: - /O2; - /Oi; - /Gy - > - /permissive-; - /sdl; - /W3; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - endif() - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /PROFILE - > - $<$: - /OPT:REF; - /OPT:ICF - > - /DEBUG:FULL - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /PROFILE - > - $<$: - /OPT:REF; - /OPT:ICF - > - /DEBUG:FULL - ) - endif() -endif() - -if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|AppleClang") - target_compile_options(${PROJECT_NAME} PUBLIC - -Wall -Wextra -Wno-error - -Wno-unused-parameter - -Wno-unused-function - -Wno-unused-variable - -Wno-missing-field-initializers - -Wno-parentheses - -Wno-narrowing - $<$:-Wno-deprecated-enum-enum-conversion> - -pthread - ) - - if (CMAKE_SYSTEM_NAME STREQUAL "Darwin") - target_link_options(${PROJECT_NAME} PUBLIC - -pthread - ) - else() - target_link_options(${PROJECT_NAME} PUBLIC - -pthread - -Wl,-export-dynamic - ) - endif() - -endif() - -################################################################################ -# Dependencies -################################################################################ -add_dependencies(${PROJECT_NAME} - OTRExporter - ZAPDUtils - libultraship -) - -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "ZAPDUtils;" - "-WHOLEARCHIVE:$/$" - "libultraship;" - storm - PNG::PNG - ) - endif() -elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "ZAPDUtils;" - -Wl,-force_load $/$ - "libultraship;" - PNG::PNG - ${CMAKE_DL_LIBS} - Threads::Threads - ) -elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch") - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "ZAPDUtils;" - -Wl,--whole-archive $/$ -Wl,--no-whole-archive - "libultraship;" - PNG::PNG - Threads::Threads - ) -elseif(CMAKE_SYSTEM_NAME STREQUAL "CafeOS") - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "ZAPDUtils;" - "libultraship;" - PNG::PNG - ) -else() - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "ZAPDUtils;" - -Wl,--whole-archive $/$ -Wl,--no-whole-archive - "libultraship;" - PNG::PNG - ${CMAKE_DL_LIBS} - Threads::Threads - ) -endif() - -if(CMAKE_SYSTEM_NAME MATCHES "NintendoSwitch|CafeOS") -add_library(pathconf OBJECT pathconf.c) -target_link_libraries(${PROJECT_NAME} PUBLIC "${ADDITIONAL_LIBRARY_DEPENDENCIES}" $ ) -else() -target_link_libraries(${PROJECT_NAME} PUBLIC "${ADDITIONAL_LIBRARY_DEPENDENCIES}") -endif() diff --git a/ZAPDTR/ZAPD/CRC32.h b/ZAPDTR/ZAPD/CRC32.h deleted file mode 100644 index 1f82c75c5..000000000 --- a/ZAPDTR/ZAPD/CRC32.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -static uint32_t CRC32B(const unsigned char* message, int32_t size) -{ - int32_t byte, crc; - int32_t mask; - - crc = 0xFFFFFFFF; - - for (int32_t i = 0; i < size; i++) - { - byte = message[i]; - crc = crc ^ byte; - - for (int32_t j = 7; j >= 0; j--) - { - mask = -(crc & 1); - crc = (crc >> 1) ^ (0xEDB88320 & mask); - } - } - - return ~(uint32_t)(crc); -} \ No newline at end of file diff --git a/ZAPDTR/ZAPD/CrashHandler.cpp b/ZAPDTR/ZAPD/CrashHandler.cpp deleted file mode 100644 index 356866536..000000000 --- a/ZAPDTR/ZAPD/CrashHandler.cpp +++ /dev/null @@ -1,205 +0,0 @@ -#include "CrashHandler.h" -#include "Utils/StringHelper.h" - -#if __has_include() -#define HAS_POSIX 1 -#else -#define HAS_POSIX 0 -#endif - -#include -#include -#include -#include - -#if HAS_POSIX == 1 -#include -#include // for __cxa_demangle -#include // for dladdr -#include -#include -#elif defined(_MSC_VER) -#include -#include - -#include - -#pragma comment(lib, "Dbghelp.lib") -#endif - -// Feel free to add more crash messages. -static std::array crashEasterEgg = { - "\tYou've met with a terrible fate, haven't you?", - "\tSEA BEARS FOAM. SLEEP BEARS DREAMS. \n\tBOTH END IN THE SAME WAY: CRASSSH!", - "\tZAPD has fallen and cannot get up.", - "\tIT'S A SECRET TO EVERYBODY. \n\tBut it shouldn't be, you'd better ask about it!", - "\tI AM ERROR.", - "\tGRUMBLE,GRUMBLE...", - "\tDODONGO DISLIKES SMOKE \n\tAnd ZAPD dislikes whatever you fed it.", - "\tMay the way of the Hero lead \n\tto the debugger.", - "\tTHE WIND FISH SLUMBERS LONG... \n\tTHE HERO'S LIFE GONE... ", - "\tSEA BEARS FOAM, SLEEP BEARS DREAMS. \n\tBOTH END IN THE SAME WAY CRASSSH!", - "\tYou've met with a terrible fate, haven't you?", - "\tMaster, I calculate a 100% probability that ZAPD has crashed. \n\tAdditionally, the " - "batteries in your Wii Remote are nearly depleted.", - "\t CONGRATURATIONS! \n" - "\tAll Pages are displayed.\n" - "\t THANK YOU! \n" - "\t You are great debugger!", - "\tRCP is HUNG UP!!\n" - "\tOh! MY GOD!!", -}; - -#if HAS_POSIX == 1 -void ErrorHandler(int sig) -{ - std::array arr; - constexpr size_t nMaxFrames = arr.size(); - size_t size = backtrace(arr.data(), nMaxFrames); - char** symbols = backtrace_symbols(arr.data(), nMaxFrames); - - fprintf(stderr, "\nZAPD crashed. (Signal: %i)\n", sig); - - srand(time(nullptr)); - auto easterIndex = rand() % crashEasterEgg.size(); - - fprintf(stderr, "\n%s\n\n", crashEasterEgg[easterIndex]); - - fprintf(stderr, "Traceback:\n"); - for (size_t i = 1; i < size; i++) - { - Dl_info info; - uint32_t gotAddress = dladdr(arr[i], &info); - std::string functionName(symbols[i]); - - if (gotAddress != 0 && info.dli_sname != nullptr) - { - int32_t status; - char* demangled = abi::__cxa_demangle(info.dli_sname, nullptr, nullptr, &status); - const char* nameFound = info.dli_sname; - - if (status == 0) - { - nameFound = demangled; - } - - functionName = StringHelper::Sprintf("%s (+0x%X)", nameFound, - (char*)arr[i] - (char*)info.dli_saddr); - free(demangled); - } - - fprintf(stderr, "%-3zd %s\n", i, functionName.c_str()); - } - - fprintf(stderr, "\n"); - - free(symbols); - exit(1); -} -#elif defined(_MSC_VER) - -void printStack(CONTEXT* ctx) -{ - BOOL result; - HANDLE process; - HANDLE thread; - HMODULE hModule; - ULONG frame; - DWORD64 displacement; - DWORD disp; - - srand(time(nullptr)); - auto easterIndex = rand() % crashEasterEgg.size(); - - fprintf(stderr, "\n%s\n\n", crashEasterEgg[easterIndex]); - -#if defined(_M_AMD64) - STACKFRAME64 stack; - memset(&stack, 0, sizeof(STACKFRAME64)); -#else - STACKFRAME stack; - memset(&stack, 0, sizeof(STACKFRAME)); -#endif - - char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME + sizeof(TCHAR)]; - char module[512]; - - PSYMBOL_INFO symbol = (PSYMBOL_INFO)buffer; - - CONTEXT ctx2; - memcpy(&ctx2, ctx, sizeof(CONTEXT)); - - process = GetCurrentProcess(); - thread = GetCurrentThread(); - SymInitialize(process, nullptr, TRUE); - - constexpr DWORD machineType = -#if defined(_M_AMD64) - IMAGE_FILE_MACHINE_AMD64; -#else - IMAGE_FILE_MACHINE_I386; -#endif - - displacement = 0; - - for (frame = 0;; frame++) - { - result = StackWalk(machineType, process, thread, &stack, &ctx2, nullptr, - SymFunctionTableAccess, SymGetModuleBase, nullptr); - if (!result) - { - break; - } - symbol->SizeOfStruct = sizeof(SYMBOL_INFO); - symbol->MaxNameLen = MAX_SYM_NAME; - SymFromAddr(process, (ULONG64)stack.AddrPC.Offset, &displacement, symbol); -#if defined(_M_AMD64) - IMAGEHLP_LINE64 line; - line.SizeOfStruct = sizeof(IMAGEHLP_LINE64); -#else - IMAGEHLP_LINE line; - line.SizeOfStruct = sizeof(IMAGEHLP_LINE); -#endif - if (SymGetLineFromAddr(process, stack.AddrPC.Offset, &disp, &line)) - { - fprintf(stderr, "%u\t %s in %s: line: %lu: \n", frame, symbol->Name, line.FileName, - line.LineNumber); - } - - else - { - fprintf(stderr, "%u\tat % s\n", frame, symbol->Name); - hModule = nullptr; - GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | - GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, - (LPCTSTR)(stack.AddrPC.Offset), &hModule); - - if (hModule != nullptr) - { - GetModuleFileNameA(hModule, module, 512 - 1); - } - fprintf(stderr, "%u\tIn %s\n", frame, module); - } - } -} - -LONG seh_filter(_EXCEPTION_POINTERS* ex) -{ - fprintf(stderr, "EXCEPTION 0x%x occured\n", ex->ExceptionRecord->ExceptionCode); - printStack(ex->ContextRecord); - return EXCEPTION_EXECUTE_HANDLER; -} -#endif - -void CrashHandler_Init() -{ -#if HAS_POSIX == 1 - signal(SIGSEGV, ErrorHandler); - signal(SIGABRT, ErrorHandler); -#elif defined(_MSC_VER) - SetUnhandledExceptionFilter(seh_filter); -#else - HANDLE_WARNING(WarningType::Always, - "tried to set error handler, but this ZAPD build lacks support for one", ""); -#endif -} diff --git a/ZAPDTR/ZAPD/CrashHandler.h b/ZAPDTR/ZAPD/CrashHandler.h deleted file mode 100644 index 102778bec..000000000 --- a/ZAPDTR/ZAPD/CrashHandler.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CRASH_HANDLER_H -#define CRASH_HANDLER_H - -void CrashHandler_Init(); - -#endif diff --git a/ZAPDTR/ZAPD/Declaration.cpp b/ZAPDTR/ZAPD/Declaration.cpp deleted file mode 100644 index 3f0c0ad93..000000000 --- a/ZAPDTR/ZAPD/Declaration.cpp +++ /dev/null @@ -1,236 +0,0 @@ -#include "Declaration.h" - -#include "Globals.h" -#include "ZVtx.h" -#include "Utils/StringHelper.h" - -Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nText) -{ - address = nAddress; - alignment = nAlignment; - size = nSize; - text = nText; -} - -Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - const std::string& nText) - : Declaration(nAddress, nAlignment, nSize, nText) -{ - varType = nVarType; - varName = nVarName; - isArray = nIsArray; -} - -Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - size_t nArrayItemCnt, const std::string& nText) - : Declaration(nAddress, nAlignment, nSize, nText) -{ - varType = nVarType; - varName = nVarName; - isArray = nIsArray; - arrayItemCnt = nArrayItemCnt; -} - -Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - const std::string& nArrayItemCntStr, const std::string& nText) - : Declaration(nAddress, nAlignment, nSize, nText) -{ - varType = nVarType; - varName = nVarName; - isArray = nIsArray; - arrayItemCntStr = nArrayItemCntStr; -} - -Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - size_t nArrayItemCnt, const std::string& nText, bool nIsExternal) - : Declaration(nAddress, nAlignment, nSize, nVarType, nVarName, nIsArray, nArrayItemCnt, nText) -{ - isExternal = nIsExternal; -} - -Declaration::Declaration(offset_t nAddress, const std::string& nIncludePath, size_t nSize, - const std::string& nVarType, const std::string& nVarName) - : Declaration(nAddress, DeclarationAlignment::Align4, nSize, "") -{ - includePath = nIncludePath; - varType = nVarType; - varName = nVarName; -} - -Declaration::~Declaration() -{ - //for (auto item : vertexHack) - //delete item; -} - -bool Declaration::IsStatic() const -{ - switch (staticConf) - { - case StaticConfig::Off: - return false; - - case StaticConfig::Global: - return Globals::Instance->forceStatic; - - case StaticConfig::On: - return true; - } - - return false; -} - -std::string Declaration::GetNormalDeclarationStr() const -{ - std::string output; - - if (preText != "") - output += preText + "\n"; - - if (IsStatic()) - { - output += "static "; - } - - if (isArray) - { - if (arrayItemCntStr != "" && (IsStatic() || forceArrayCnt)) - { - output += StringHelper::Sprintf("%s %s[%s];\n", varType.c_str(), varName.c_str(), - arrayItemCntStr.c_str()); - } - else if (arrayItemCnt != 0 && (IsStatic() || forceArrayCnt)) - { - output += StringHelper::Sprintf("%s %s[%i] = {\n", varType.c_str(), varName.c_str(), - arrayItemCnt); - } - else - { - output += StringHelper::Sprintf("%s %s[] = {\n", varType.c_str(), varName.c_str()); - } - - output += text + "\n"; - } - else - { - output += StringHelper::Sprintf("%s %s = { ", varType.c_str(), varName.c_str()); - output += text; - } - - if (output.back() == '\n') - output += "};"; - else - output += " };"; - - if (rightText != "") - output += " " + rightText + ""; - - output += "\n"; - - if (postText != "") - output += postText + "\n"; - - output += "\n"; - - return output; -} - -std::string Declaration::GetExternalDeclarationStr() const -{ - std::string output; - - if (preText != "") - output += preText + "\n"; - - if (IsStatic()) - { - output += "static "; - } - - if (arrayItemCntStr != "" && (IsStatic() || forceArrayCnt)) - output += StringHelper::Sprintf("%s %s[%s] = ", varType.c_str(), varName.c_str(), - arrayItemCntStr.c_str()); - else if (arrayItemCnt != 0 && (IsStatic() || forceArrayCnt)) - output += - StringHelper::Sprintf("%s %s[%i] = ", varType.c_str(), varName.c_str(), arrayItemCnt); - else - output += StringHelper::Sprintf("%s %s[] = ", varType.c_str(), varName.c_str()); - - output += StringHelper::Sprintf("{\n#include \"%s\"\n};", includePath.c_str()); - - if (rightText != "") - output += " " + rightText + ""; - - output += "\n"; - - if (postText != "") - output += postText + "\n"; - - output += "\n"; - - return output; -} - -std::string Declaration::GetExternStr() const -{ - if (IsStatic() || varType == "" || isUnaccounted) - { - return ""; - } - - if (Globals::Instance->otrMode) /* && (varType == "Gfx" || varType == "u64" || varType == "AnimationHeader" || varType == "LinkAnimationHeader" || - varType == "StandardLimb" || varType == "JointIndex" || varType == "Vtx" || varType == "FlexSkeletonHeader" || varType == "SkeletonHeader") || - varType == "CollisionHeader") */ - return ""; - - if (isArray) - { - if (arrayItemCntStr != "" && (IsStatic() || forceArrayCnt)) - { - return StringHelper::Sprintf("extern %s %s[%s];\n", varType.c_str(), varName.c_str(), - arrayItemCntStr.c_str()); - } - else if (arrayItemCnt != 0 && (IsStatic() || forceArrayCnt)) - { - return StringHelper::Sprintf("extern %s %s[%i];\n", varType.c_str(), varName.c_str(), - arrayItemCnt); - } - else - return StringHelper::Sprintf("extern %s %s[];\n", varType.c_str(), varName.c_str()); - } - - return StringHelper::Sprintf("extern %s %s;\n", varType.c_str(), varName.c_str()); -} - -std::string Declaration::GetStaticForwardDeclarationStr() const -{ - if (!IsStatic() || isUnaccounted) - return ""; - - if (isArray) - { - if (arrayItemCntStr == "" && arrayItemCnt == 0) - { - // Forward declaring static arrays without specifying the size is not allowed. - return ""; - } - - if (arrayItemCntStr != "") - { - return StringHelper::Sprintf("static %s %s[%s];\n", varType.c_str(), varName.c_str(), - arrayItemCntStr.c_str()); - } - else - { - return StringHelper::Sprintf("static %s %s[%i];\n", varType.c_str(), varName.c_str(), - arrayItemCnt); - } - } - - return StringHelper::Sprintf("static %s %s;\n", varType.c_str(), varName.c_str()); -} diff --git a/ZAPDTR/ZAPD/Declaration.h b/ZAPDTR/ZAPD/Declaration.h deleted file mode 100644 index 64712d8c3..000000000 --- a/ZAPDTR/ZAPD/Declaration.h +++ /dev/null @@ -1,87 +0,0 @@ -#pragma once - -#include -#include -#include - -// TODO: should we drop the `_t` suffix because of UNIX compliance? -typedef uint32_t segptr_t; -typedef uint32_t offset_t; - -#define SEGMENTED_NULL ((segptr_t)0) - -enum class DeclarationAlignment -{ - Align4, - Align8 -}; - -enum class StaticConfig -{ - Off, - Global, - On -}; - -class ZVtx; - -class Declaration -{ -public: - offset_t address; - DeclarationAlignment alignment; - size_t size; - std::string preText; - std::string text; - std::string rightText; - std::string postText; - std::string preComment; - std::string postComment; - std::string varType; - std::string varName; - std::string includePath; - - std::vector vertexHack; - - bool isExternal = false; - bool isArray = false; - bool forceArrayCnt = false; - size_t arrayItemCnt = 0; - std::string arrayItemCntStr = ""; - std::vector references; - bool isUnaccounted = false; - bool isPlaceholder = false; - bool declaredInXml = false; - StaticConfig staticConf = StaticConfig::Global; - - Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - const std::string& nText); - Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - size_t nArrayItemCnt, const std::string& nText); - Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - const std::string& nArrayItemCntStr, const std::string& nText); - Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nVarType, const std::string& nVarName, bool nIsArray, - size_t nArrayItemCnt, const std::string& nText, bool nIsExternal); - - Declaration(offset_t nAddress, const std::string& nIncludePath, size_t nSize, - const std::string& nVarType, const std::string& nVarName); - - ~Declaration(); - - bool IsStatic() const; - - std::string GetNormalDeclarationStr() const; - std::string GetExternalDeclarationStr() const; - - std::string GetExternStr() const; - - std::string GetStaticForwardDeclarationStr() const; - -protected: - Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize, - const std::string& nText); -}; diff --git a/ZAPDTR/ZAPD/ExecutableMain.cpp b/ZAPDTR/ZAPD/ExecutableMain.cpp deleted file mode 100644 index 303ea24ad..000000000 --- a/ZAPDTR/ZAPD/ExecutableMain.cpp +++ /dev/null @@ -1,5 +0,0 @@ -extern "C" int zapd_main(int argc, char* argv[]); - -int main(int argc, char* argv[]) { - return zapd_main(argc, argv); -} diff --git a/ZAPDTR/ZAPD/FileWorker.cpp b/ZAPDTR/ZAPD/FileWorker.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/ZAPDTR/ZAPD/FileWorker.h b/ZAPDTR/ZAPD/FileWorker.h deleted file mode 100644 index 6ceae8076..000000000 --- a/ZAPDTR/ZAPD/FileWorker.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include -#include -#include -#include "ZFile.h" - -class FileWorker -{ -public: - std::vector files; - std::vector externalFiles; - std::vector segments; - std::map> segmentRefFiles; -}; \ No newline at end of file diff --git a/ZAPDTR/ZAPD/GameConfig.cpp b/ZAPDTR/ZAPD/GameConfig.cpp deleted file mode 100644 index 9a2e8898c..000000000 --- a/ZAPDTR/ZAPD/GameConfig.cpp +++ /dev/null @@ -1,207 +0,0 @@ -#include "GameConfig.h" - -#include -#include -#include - -#include "Utils/Directory.h" -#include -#include "Utils/Path.h" -#include "ZFile.h" -#include "tinyxml2.h" - -using ConfigFunc = void (GameConfig::*)(const tinyxml2::XMLElement&); - -GameConfig::~GameConfig() -{ - for (auto& declPair : segmentRefFiles) - { - for (auto& file : declPair.second) - { - delete file; - } - } -} - -void GameConfig::ReadTexturePool(const fs::path& texturePoolXmlPath) -{ - tinyxml2::XMLDocument doc; - tinyxml2::XMLError eResult = doc.LoadFile(texturePoolXmlPath.string().c_str()); - - if (eResult != tinyxml2::XML_SUCCESS) - { - fprintf(stderr, "Warning: Unable to read texture pool XML with error code %i\n", eResult); - return; - } - - tinyxml2::XMLNode* root = doc.FirstChild(); - - if (root == nullptr) - return; - - for (tinyxml2::XMLElement* child = root->FirstChildElement(); child != nullptr; - child = child->NextSiblingElement()) - { - if (std::string_view(child->Name()) == "Texture") - { - std::string crcStr = child->Attribute("CRC"); - fs::path texPath = child->Attribute("Path"); - std::string texName; - - uint32_t crc = strtoul(crcStr.c_str(), nullptr, 16); - - texturePool[crc].path = texPath; - } - } -} - -void GameConfig::GenSymbolMap(const fs::path& symbolMapPath) -{ - auto symbolLines = DiskFile::ReadAllLines(symbolMapPath); - - for (std::string& symbolLine : symbolLines) - { - auto split = StringHelper::Split(symbolLine, " "); - uint32_t addr = strtoul(split[0].c_str(), nullptr, 16); - std::string symbolName = split[1]; - - symbolMap[addr] = std::move(symbolName); - } -} - -void GameConfig::ConfigFunc_SymbolMap(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - GenSymbolMap(Path::GetDirectoryName(configFilePath) / fileName); -} - -void GameConfig::ConfigFunc_ActorList(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - std::vector lines = - DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); - - for (auto& line : lines) - actorList.emplace_back(std::move(line)); -} - -void GameConfig::ConfigFunc_ObjectList(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - std::vector lines = - DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); - - for (auto& line : lines) - objectList.emplace_back(std::move(line)); -} - -void GameConfig::ConfigFunc_EntranceList(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - std::vector lines = - DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); - - for (auto& line : lines) - entranceList.emplace_back(std::move(line)); -} - -void GameConfig::ConfigFunc_specialEntranceList(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - std::vector lines = - DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName); - - for (auto& line : lines) - specialEntranceList.emplace_back(std::move(line)); -} - -void GameConfig::ConfigFunc_TexturePool(const tinyxml2::XMLElement& element) -{ - std::string fileName = element.Attribute("File"); - ReadTexturePool(Path::GetDirectoryName(configFilePath) / fileName); -} - -void GameConfig::ConfigFunc_BGConfig(const tinyxml2::XMLElement& element) -{ - bgScreenWidth = element.IntAttribute("ScreenWidth", 320); - bgScreenHeight = element.IntAttribute("ScreenHeight", 240); -} - -void GameConfig::ConfigFunc_ExternalXMLFolder(const tinyxml2::XMLElement& element) -{ - const char* pathValue = element.Attribute("Path"); - if (pathValue == nullptr) - { - throw std::runtime_error( - StringHelper::Sprintf("Parse: Fatal error in configuration file.\n" - "\t Missing 'Path' attribute in `ExternalXMLFolder` element.\n")); - } - if (externalXmlFolder != "") - { - throw std::runtime_error(StringHelper::Sprintf("Parse: Fatal error in configuration file.\n" - "\t `ExternalXMLFolder` is duplicated.\n")); - } - externalXmlFolder = pathValue; -} - -void GameConfig::ConfigFunc_ExternalFile(const tinyxml2::XMLElement& element) -{ - const char* xmlPathValue = element.Attribute("XmlPath"); - if (xmlPathValue == nullptr) - { - throw std::runtime_error( - StringHelper::Sprintf("Parse: Fatal error in configuration file.\n" - "\t Missing 'XmlPath' attribute in `ExternalFile` element.\n")); - } - const char* outPathValue = element.Attribute("OutPath"); - if (outPathValue == nullptr) - { - throw std::runtime_error( - StringHelper::Sprintf("Parse: Fatal error in configuration file.\n" - "\t Missing 'OutPath' attribute in `ExternalFile` element.\n")); - } - - externalFiles.push_back(ExternalFile(fs::path(xmlPathValue), fs::path(outPathValue))); -} - -void GameConfig::ReadConfigFile(const fs::path& argConfigFilePath) -{ - static const std::unordered_map ConfigFuncDictionary = { - {"SymbolMap", &GameConfig::ConfigFunc_SymbolMap}, - {"ActorList", &GameConfig::ConfigFunc_ActorList}, - {"ObjectList", &GameConfig::ConfigFunc_ObjectList}, - {"EntranceList", &GameConfig::ConfigFunc_EntranceList}, - {"SpecialEntranceList", &GameConfig::ConfigFunc_specialEntranceList}, - {"TexturePool", &GameConfig::ConfigFunc_TexturePool}, - {"BGConfig", &GameConfig::ConfigFunc_BGConfig}, - {"ExternalXMLFolder", &GameConfig::ConfigFunc_ExternalXMLFolder}, - {"ExternalFile", &GameConfig::ConfigFunc_ExternalFile}, - }; - - configFilePath = argConfigFilePath.string(); - tinyxml2::XMLDocument doc; - tinyxml2::XMLError eResult = doc.LoadFile(configFilePath.c_str()); - - if (eResult != tinyxml2::XML_SUCCESS) - { - throw std::runtime_error("Error: Unable to read config file."); - } - - tinyxml2::XMLNode* root = doc.FirstChild(); - - if (root == nullptr) - return; - - for (tinyxml2::XMLElement* child = root->FirstChildElement(); child != nullptr; - child = child->NextSiblingElement()) - { - auto it = ConfigFuncDictionary.find(child->Name()); - if (it == ConfigFuncDictionary.end()) - { - fprintf(stderr, "Unsupported configuration variable: %s\n", child->Name()); - continue; - } - - std::invoke(it->second, *this, *child); - } -} diff --git a/ZAPDTR/ZAPD/GameConfig.h b/ZAPDTR/ZAPD/GameConfig.h deleted file mode 100644 index 2a783d10a..000000000 --- a/ZAPDTR/ZAPD/GameConfig.h +++ /dev/null @@ -1,62 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -#include "Utils/Directory.h" -#include "tinyxml2.h" - -struct TexturePoolEntry -{ - fs::path path = ""; // Path to Shared Texture -}; - -class ExternalFile -{ -public: - fs::path xmlPath, outPath; - - ExternalFile(fs::path nXmlPath, fs::path nOutPath); -}; - -class ZFile; - -class GameConfig -{ -public: - std::string configFilePath; - std::map> segmentRefFiles; - std::map symbolMap; - std::vector actorList; - std::vector objectList; - std::vector entranceList; - std::vector specialEntranceList; - std::map texturePool; // Key = CRC - - // ZBackground - uint32_t bgScreenWidth = 320, bgScreenHeight = 240; - - // ExternalFile - fs::path externalXmlFolder; - std::vector externalFiles; - - GameConfig() = default; - ~GameConfig(); - - void ReadTexturePool(const fs::path& texturePoolXmlPath); - void GenSymbolMap(const fs::path& symbolMapPath); - - void ConfigFunc_SymbolMap(const tinyxml2::XMLElement& element); - void ConfigFunc_ActorList(const tinyxml2::XMLElement& element); - void ConfigFunc_ObjectList(const tinyxml2::XMLElement& element); - void ConfigFunc_EntranceList(const tinyxml2::XMLElement& element); - void ConfigFunc_specialEntranceList(const tinyxml2::XMLElement& element); - void ConfigFunc_TexturePool(const tinyxml2::XMLElement& element); - void ConfigFunc_BGConfig(const tinyxml2::XMLElement& element); - void ConfigFunc_ExternalXMLFolder(const tinyxml2::XMLElement& element); - void ConfigFunc_ExternalFile(const tinyxml2::XMLElement& element); - - void ReadConfigFile(const fs::path& configFilePath); -}; diff --git a/ZAPDTR/ZAPD/Globals.cpp b/ZAPDTR/ZAPD/Globals.cpp deleted file mode 100644 index a6b22cfa2..000000000 --- a/ZAPDTR/ZAPD/Globals.cpp +++ /dev/null @@ -1,325 +0,0 @@ -#include "Globals.h" - -#include -#include - -#include -#include "Utils/Path.h" -#include "WarningHandler.h" -#include "tinyxml2.h" - -Globals* Globals::Instance; - -Globals::Globals() -{ - Instance = this; - - game = ZGame::OOT_RETAIL; - genSourceFile = true; - testMode = false; - profile = false; - useLegacyZDList = false; - useExternalResources = true; - singleThreaded = true; - verbosity = VerbosityLevel::VERBOSITY_SILENT; - outputPath = Directory::GetCurrentDirectory(); -} - -Globals::~Globals() -{ - for (const auto& w : workerData) - { - delete w.second; - } - - if (rom != nullptr) - { - delete rom; - } -} - -void Globals::AddSegment(int32_t segment, ZFile* file, int workerID) -{ - if (!Globals::Instance->singleThreaded) - { - auto worker = workerData[workerID]; - - if (std::find(worker->segments.begin(), worker->segments.end(), segment) == - worker->segments.end()) - worker->segments.push_back(segment); - if (worker->segmentRefFiles.find(segment) == worker->segmentRefFiles.end()) - worker->segmentRefFiles[segment] = std::vector(); - - worker->segmentRefFiles[segment].push_back(file); - } - else - { - if (std::find(segments.begin(), segments.end(), segment) == segments.end()) - segments.push_back(segment); - if (cfg.segmentRefFiles.find(segment) == cfg.segmentRefFiles.end()) - cfg.segmentRefFiles[segment] = std::vector(); - - cfg.segmentRefFiles[segment].push_back(file); - } -} - -bool Globals::HasSegment(int32_t segment, int workerID) -{ - if (!Globals::Instance->singleThreaded) - return std::find(workerData[workerID]->segments.begin(), - workerData[workerID]->segments.end(), segment) != workerData[workerID]->segments.end(); - else - return std::find(segments.begin(), segments.end(), segment) != segments.end(); -} - -ZFile* Globals::GetSegment(int32_t segment, int workerID) -{ - if (!Globals::Instance->singleThreaded) - { - if (HasSegment(segment, workerID)) - { - int idx = std::find(workerData[workerID]->segments.begin(), - workerData[workerID]->segments.end(), segment) - - workerData[workerID]->segments.begin(); - return workerData[workerID]->files[idx]; - } - else - return nullptr; - } - else - { - if (HasSegment(segment, workerID)) - { - int idx = std::find(segments.begin(), segments.end(), segment) - segments.begin(); - return files[idx]; - } - else - return nullptr; - } -} - -std::map> Globals::GetSegmentRefFiles(int workerID) -{ - if (!Globals::Instance->singleThreaded) - return workerData[workerID]->segmentRefFiles; - else - return cfg.segmentRefFiles; -} - -void Globals::AddFile(ZFile* file, int workerID) -{ - if (singleThreaded) - files.push_back(file); - else - workerData[workerID]->files.push_back(file); -} - -void Globals::AddExternalFile(ZFile* file, int workerID) -{ - if (singleThreaded) - externalFiles.push_back(file); - else - workerData[workerID]->externalFiles.push_back(file); -} - -void Globals::BuildAssetTexture(const fs::path& pngFilePath, TextureType texType, const fs::path& outPath) -{ - std::string name = outPath.stem().string(); - - ZTexture tex(nullptr); - - if (name.find("u32") != std::string::npos) - tex.dWordAligned = false; - - tex.FromPNG(pngFilePath.string(), texType); - std::string cfgPath = StringHelper::Split(pngFilePath.string(), ".")[0] + ".cfg"; - - if (DiskFile::Exists(cfgPath)) - name = DiskFile::ReadAllText(cfgPath); - - std::string src = tex.GetBodySourceCode(); - - DiskFile::WriteAllBytes(outPath.string(), src.c_str(), src.size()); -} - -std::map& Globals::GetExporterMap() -{ - static std::map exporters; - return exporters; -} - -void Globals::AddExporter(std::string exporterName, ExporterSet* exporterSet) -{ - auto& exporters = GetExporterMap(); - exporters[exporterName] = exporterSet; -} - -ZResourceExporter* Globals::GetExporter(ZResourceType resType) -{ - auto& exporters = GetExporterMap(); - - if (currentExporter != "" && exporters[currentExporter]->exporters.find(resType) != - exporters[currentExporter]->exporters.end()) - return exporters[currentExporter]->exporters[resType]; - else - return nullptr; -} - -ExporterSet* Globals::GetExporterSet() -{ - auto& exporters = GetExporterMap(); - - if (currentExporter != "") - return exporters[currentExporter]; - else - return nullptr; -} - -std::vector Globals::GetBaseromFile(std::string fileName) -{ - if (fileMode == ZFileMode::ExtractDirectory) - { - if (StringHelper::Contains(fileName, "baserom/")) - fileName = StringHelper::Split(fileName, "baserom/")[1]; - - return rom->GetFile(fileName); - - } - else - return DiskFile::ReadAllBytes(fileName); -} - -bool Globals::GetSegmentedPtrName(segptr_t segAddress, ZFile* currentFile, - const std::string& expectedType, std::string& declName, int workerID) -{ - if (segAddress == 0) - { - declName = "NULL"; - return true; - } - - uint8_t segment = GETSEGNUM(segAddress); - uint32_t offset = Seg2Filespace(segAddress, currentFile->baseAddress); - ZSymbol* sym; - - sym = currentFile->GetSymbolResource(offset); - if (sym != nullptr) - { - if (expectedType == "" || expectedType == sym->GetSourceTypeName()) - { - declName = sym->GetName(); - return true; - } - } - sym = currentFile->GetSymbolResource(segAddress); - if (sym != nullptr) - { - if (expectedType == "" || expectedType == sym->GetSourceTypeName()) - { - declName = sym->GetName(); - return true; - } - } - - if (currentFile->IsSegmentedInFilespaceRange(segAddress)) - { - if (currentFile->GetDeclarationPtrName(segAddress, expectedType, declName)) - return true; - } - else if (HasSegment(segment, workerID)) - { - // OTRTODO: Multithreading - auto segs = GetSegmentRefFiles(workerID); - for (auto file : segs[segment]) - { - offset = Seg2Filespace(segAddress, file->baseAddress); - - sym = file->GetSymbolResource(offset); - if (sym != nullptr) - { - if (expectedType == "" || expectedType == sym->GetSourceTypeName()) - { - declName = sym->GetName(); - return true; - } - } - sym = file->GetSymbolResource(segAddress); - if (sym != nullptr) - { - if (expectedType == "" || expectedType == sym->GetSourceTypeName()) - { - declName = sym->GetName(); - return true; - } - } - - if (file->IsSegmentedInFilespaceRange(segAddress)) - { - if (file->GetDeclarationPtrName(segAddress, expectedType, declName)) - return true; - } - } - } - - const auto& symbolFromMap = Globals::Instance->cfg.symbolMap.find(segAddress); - if (symbolFromMap != Globals::Instance->cfg.symbolMap.end()) - { - declName = "&" + symbolFromMap->second; - return true; - } - - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; -} - -bool Globals::GetSegmentedArrayIndexedName(segptr_t segAddress, size_t elementSize, - ZFile* currentFile, const std::string& expectedType, - std::string& declName, int workerID) -{ - if (segAddress == 0) - { - declName = "NULL"; - return true; - } - - uint8_t segment = GETSEGNUM(segAddress); - - if (currentFile->IsSegmentedInFilespaceRange(segAddress)) - { - bool addressFound = currentFile->GetDeclarationArrayIndexedName(segAddress, elementSize, - expectedType, declName); - if (addressFound) - return true; - } - else if (HasSegment(segment, workerID)) - { - // OTRTODO: Multithreading - auto segs = GetSegmentRefFiles(workerID); - for (auto file : segs[segment]) - { - if (file->IsSegmentedInFilespaceRange(segAddress)) - { - bool addressFound = file->GetDeclarationArrayIndexedName(segAddress, elementSize, - expectedType, declName); - if (addressFound) - return true; - } - } - } - - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; -} - -ExternalFile::ExternalFile(fs::path nXmlPath, fs::path nOutPath) - : xmlPath{nXmlPath}, outPath{nOutPath} -{ -} - -ExporterSet::~ExporterSet() -{ - for (auto& it : exporters) - { - delete it.second; - } -} diff --git a/ZAPDTR/ZAPD/Globals.h b/ZAPDTR/ZAPD/Globals.h deleted file mode 100644 index 0fe8e0545..000000000 --- a/ZAPDTR/ZAPD/Globals.h +++ /dev/null @@ -1,113 +0,0 @@ -#pragma once - -#include -#include -#include -#include "GameConfig.h" -#include "ZFile.h" -#include -#include - -class ZRoom; - -enum class VerbosityLevel -{ - VERBOSITY_SILENT, - VERBOSITY_INFO, - VERBOSITY_DEBUG -}; - -typedef void (*ExporterSetFunc)(ZFile*); -typedef bool (*ExporterSetFuncBool)(ZFileMode fileMode); -typedef void (*ExporterSetFuncVoid)(int argc, char* argv[], int& i); -typedef void (*ExporterSetFuncVoid2)(const std::string& buildMode, ZFileMode& fileMode); -typedef void (*ExporterSetFuncVoid3)(); -typedef void (*ExporterSetFuncVoid4)(tinyxml2::XMLElement* reader); -typedef void (*ExporterSetResSave)(ZResource* res, BinaryWriter& writer); - -class ExporterSet -{ -public: - ~ExporterSet(); - - std::map exporters; - ExporterSetFuncVoid parseArgsFunc = nullptr; - ExporterSetFuncVoid2 parseFileModeFunc = nullptr; - ExporterSetFuncBool processFileModeFunc = nullptr; - ExporterSetFunc beginFileFunc = nullptr; - ExporterSetFunc endFileFunc = nullptr; - ExporterSetFuncVoid3 beginXMLFunc = nullptr; - ExporterSetFuncVoid3 endXMLFunc = nullptr; - ExporterSetResSave resSaveFunc = nullptr; - ExporterSetFuncVoid3 endProgramFunc = nullptr; - - ExporterSetFuncVoid4 processCompilableFunc = nullptr; -}; - -class Globals -{ -public: - static Globals* Instance; - - bool genSourceFile; // Used for extraction - bool useExternalResources; - bool testMode; // Enables certain experimental features - bool outputCrc = false; - bool profile; // Measure performance of certain operations - bool useLegacyZDList; - bool singleThreaded; - VerbosityLevel verbosity; // ZAPD outputs additional information - ZFileMode fileMode = ZFileMode::Invalid; - fs::path baseRomPath, inputPath, outputPath, sourceOutputPath, cfgPath, fileListPath; - TextureType texType; - ZGame game; - GameConfig cfg; - bool verboseUnaccounted = false; - bool gccCompat = false; - bool forceStatic = false; - bool forceUnaccountedStatic = false; - bool otrMode = true; - bool buildRawTexture = false; - bool onlyGenSohOtr = false; - - ZRom* rom = nullptr; - std::vector files; - std::vector externalFiles; - std::vector segments; - - std::map workerData; - - std::string currentExporter; - static std::map& GetExporterMap(); - static void AddExporter(std::string exporterName, ExporterSet* exporterSet); - - Globals(); - ~Globals(); - - void AddSegment(int32_t segment, ZFile* file, int workerID); - bool HasSegment(int32_t segment, int workerID); - ZFile* GetSegment(int32_t segment, int workerID); - std::map> GetSegmentRefFiles(int workerID); - void AddFile(ZFile* file, int workerID); - void AddExternalFile(ZFile* file, int workerID); - void BuildAssetTexture(const fs::path& pngFilePath, TextureType texType, const fs::path& outPath); - - ZResourceExporter* GetExporter(ZResourceType resType); - ExporterSet* GetExporterSet(); - - std::vector GetBaseromFile(std::string fileName); - - /** - * Search in every file (and the symbol map) for the `segAddress` passed as parameter. - * If the segment of `currentFile` is the same segment of `segAddress`, then that file will be - * used only, otherwise, the search will be performed in every other file. - * The name of that variable will be stored in the `declName` parameter. - * Returns `true` if the address is found. `false` otherwise, - * in which case `declName` will be set to the address formatted as a pointer. - */ - bool GetSegmentedPtrName(segptr_t segAddress, ZFile* currentFile, - const std::string& expectedType, std::string& declName, int workerID); - - bool GetSegmentedArrayIndexedName(segptr_t segAddress, size_t elementSize, ZFile* currentFile, - const std::string& expectedType, std::string& declName, int workerID); -}; diff --git a/ZAPDTR/ZAPD/ImageBackend.cpp b/ZAPDTR/ZAPD/ImageBackend.cpp deleted file mode 100644 index 7ebb29121..000000000 --- a/ZAPDTR/ZAPD/ImageBackend.cpp +++ /dev/null @@ -1,506 +0,0 @@ -#include "ImageBackend.h" - -#include -#include -#include -#include - -#include "Utils/StringHelper.h" -#include "WarningHandler.h" - -/* ImageBackend */ - -ImageBackend::~ImageBackend() -{ - FreeImageData(); -} - -void ImageBackend::ReadPng(const char* filename) -{ - FreeImageData(); - - FILE* fp = fopen(filename, "rb"); - if (fp == nullptr) - { - std::string errorHeader = StringHelper::Sprintf("could not open file '%s'", filename); - HANDLE_ERROR(WarningType::InvalidPNG, errorHeader, ""); - } - - png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); - if (png == nullptr) - { - HANDLE_ERROR(WarningType::InvalidPNG, "could not create png struct", ""); - } - - png_infop info = png_create_info_struct(png); - if (info == nullptr) - { - HANDLE_ERROR(WarningType::InvalidPNG, "could not create png info", ""); - } - - if (setjmp(png_jmpbuf(png))) - { - // TODO: better warning explanation - HANDLE_ERROR(WarningType::InvalidPNG, "setjmp(png_jmpbuf(png))", ""); - } - - png_init_io(png, fp); - - png_read_info(png, info); - - width = png_get_image_width(png, info); - height = png_get_image_height(png, info); - colorType = png_get_color_type(png, info); - bitDepth = png_get_bit_depth(png, info); - -#ifdef TEXTURE_DEBUG - printf("Width: %u\n", width); - printf("Height: %u\n", height); - printf("ColorType: "); - switch (colorType) - { - case PNG_COLOR_TYPE_RGBA: - printf("PNG_COLOR_TYPE_RGBA\n"); - break; - - case PNG_COLOR_TYPE_RGB: - printf("PNG_COLOR_TYPE_RGB\n"); - break; - - case PNG_COLOR_TYPE_PALETTE: - printf("PNG_COLOR_TYPE_PALETTE\n"); - break; - - default: - printf("%u\n", colorType); - break; - } - printf("BitDepth: %u\n", bitDepth); - printf("\n"); -#endif - - // Read any color_type into 8bit depth, RGBA format. - // See http://www.libpng.org/pub/png/libpng-manual.txt - - if (bitDepth == 16) - png_set_strip_16(png); - - if (colorType == PNG_COLOR_TYPE_PALETTE) - { - // png_set_palette_to_rgb(png); - isColorIndexed = true; - } - - // PNG_COLOR_TYPE_GRAY_ALPHA is always 8 or 16bit depth. - if (colorType == PNG_COLOR_TYPE_GRAY && bitDepth < 8) - png_set_expand_gray_1_2_4_to_8(png); - - /*if (png_get_valid(png, info, PNG_INFO_tRNS)) - png_set_tRNS_to_alpha(png);*/ - - // These color_type don't have an alpha channel then fill it with 0xff. - /*if(*color_type == PNG_COLOR_TYPE_RGB || - *color_type == PNG_COLOR_TYPE_GRAY || - *color_type == PNG_COLOR_TYPE_PALETTE) - png_set_filler(png, 0xFF, PNG_FILLER_AFTER);*/ - - if (colorType == PNG_COLOR_TYPE_GRAY || colorType == PNG_COLOR_TYPE_GRAY_ALPHA) - png_set_gray_to_rgb(png); - - png_read_update_info(png, info); - - size_t rowBytes = png_get_rowbytes(png, info); - pixelMatrix = (uint8_t**)malloc(sizeof(uint8_t*) * height); - for (size_t y = 0; y < height; y++) - { - pixelMatrix[y] = (uint8_t*)malloc(rowBytes); - } - - png_read_image(png, pixelMatrix); - -#ifdef TEXTURE_DEBUG - printf("rowBytes: %zu\n", rowBytes); - - size_t bytePerPixel = GetBytesPerPixel(); - printf("imgData\n"); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - for (size_t z = 0; z < bytePerPixel; z++) - { - printf("%02X ", pixelMatrix[y][x * bytePerPixel + z]); - } - printf(" "); - } - printf("\n"); - } - printf("\n"); -#endif - - fclose(fp); - - png_destroy_read_struct(&png, &info, nullptr); - - hasImageData = true; -} - -void ImageBackend::ReadPng(const fs::path& filename) -{ - ReadPng(filename.string().c_str()); -} - -void ImageBackend::WritePng(const char* filename) -{ - assert(hasImageData); - - FILE* fp = fopen(filename, "wb"); - if (fp == nullptr) - { - std::string errorHeader = - StringHelper::Sprintf("could not open file '%s' in write mode", filename); - HANDLE_ERROR(WarningType::InvalidPNG, errorHeader, ""); - } - - png_structp png = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); - if (png == nullptr) - { - HANDLE_ERROR(WarningType::InvalidPNG, "could not create png struct", ""); - } - - png_infop info = png_create_info_struct(png); - if (info == nullptr) - { - HANDLE_ERROR(WarningType::InvalidPNG, "could not create png info", ""); - } - - if (setjmp(png_jmpbuf(png))) - { - // TODO: better warning description - HANDLE_ERROR(WarningType::InvalidPNG, "setjmp(png_jmpbuf(png))", ""); - } - - png_init_io(png, fp); - - png_set_IHDR(png, info, width, height, - bitDepth, // 8, - colorType, // PNG_COLOR_TYPE_RGBA, - PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - - if (isColorIndexed) - { - png_set_PLTE(png, info, static_cast(colorPalette), paletteSize); - -#ifdef TEXTURE_DEBUG - printf("palette\n"); - png_color* aux = (png_color*)colorPalette; - for (size_t y = 0; y < paletteSize; y++) - { - printf("#%02X%02X%02X ", aux[y].red, aux[y].green, aux[y].blue); - if ((y + 1) % 8 == 0) - printf("\n"); - } - printf("\n"); -#endif - - png_set_tRNS(png, info, alphaPalette, paletteSize, nullptr); - } - - png_write_info(png, info); - - // To remove the alpha channel for PNG_COLOR_TYPE_RGB format, - // Use png_set_filler(). - // png_set_filler(png, 0, PNG_FILLER_AFTER); - -#ifdef TEXTURE_DEBUG - size_t bytePerPixel = GetBytesPerPixel(); - printf("imgData\n"); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width * bytePerPixel; x++) - { - printf("%02X ", pixelMatrix[y][x]); - } - printf("\n"); - } - printf("\n"); -#endif - - png_write_image(png, pixelMatrix); - png_write_end(png, nullptr); - - fclose(fp); - - png_destroy_write_struct(&png, &info); -} - -void ImageBackend::WritePng(const fs::path& filename) -{ - // Note: The .string() is necessary for MSVC, due to the implementation of std::filesystem - // differing from GCC. Do not remove! - WritePng(filename.string().c_str()); -} - -void ImageBackend::SetTextureData(const std::vector>& texData, - uint32_t nWidth, uint32_t nHeight, uint8_t nColorType, - uint8_t nBitDepth) -{ - FreeImageData(); - - width = nWidth; - height = nHeight; - colorType = nColorType; - bitDepth = nBitDepth; - - size_t bytePerPixel = GetBytesPerPixel(); - - pixelMatrix = static_cast(malloc(sizeof(uint8_t*) * height)); - for (size_t y = 0; y < height; y++) - { - pixelMatrix[y] = static_cast(malloc(sizeof(uint8_t*) * width * bytePerPixel)); - for (size_t x = 0; x < width; x++) - { - pixelMatrix[y][x * bytePerPixel + 0] = texData.at(y).at(x).r; - pixelMatrix[y][x * bytePerPixel + 1] = texData.at(y).at(x).g; - pixelMatrix[y][x * bytePerPixel + 2] = texData.at(y).at(x).b; - - if (colorType == PNG_COLOR_TYPE_RGBA) - pixelMatrix[y][x * bytePerPixel + 3] = texData.at(y).at(x).a; - } - } - hasImageData = true; -} - -void ImageBackend::InitEmptyRGBImage(uint32_t nWidth, uint32_t nHeight, bool alpha) -{ - FreeImageData(); - - width = nWidth; - height = nHeight; - colorType = PNG_COLOR_TYPE_RGB; - if (alpha) - colorType = PNG_COLOR_TYPE_RGBA; - bitDepth = 8; // nBitDepth; - - size_t bytePerPixel = GetBytesPerPixel(); - - pixelMatrix = static_cast(malloc(sizeof(uint8_t*) * height)); - for (size_t y = 0; y < height; y++) - { - pixelMatrix[y] = static_cast(calloc(width * bytePerPixel, sizeof(uint8_t*))); - } - - hasImageData = true; -} - -void ImageBackend::InitEmptyPaletteImage(uint32_t nWidth, uint32_t nHeight) -{ - FreeImageData(); - - width = nWidth; - height = nHeight; - colorType = PNG_COLOR_TYPE_PALETTE; - bitDepth = 8; - - size_t bytePerPixel = GetBytesPerPixel(); - - pixelMatrix = (uint8_t**)malloc(sizeof(uint8_t*) * height); - for (size_t y = 0; y < height; y++) - { - pixelMatrix[y] = static_cast(calloc(width * bytePerPixel, sizeof(uint8_t*))); - } - colorPalette = calloc(paletteSize, sizeof(png_color)); - alphaPalette = static_cast(calloc(paletteSize, sizeof(uint8_t))); - - hasImageData = true; - isColorIndexed = true; -} - -RGBAPixel ImageBackend::GetPixel(size_t y, size_t x) const -{ - assert(y < height); - assert(x < width); - assert(!isColorIndexed); - - RGBAPixel pixel; - size_t bytePerPixel = GetBytesPerPixel(); - pixel.r = pixelMatrix[y][x * bytePerPixel + 0]; - pixel.g = pixelMatrix[y][x * bytePerPixel + 1]; - pixel.b = pixelMatrix[y][x * bytePerPixel + 2]; - if (colorType == PNG_COLOR_TYPE_RGBA) - pixel.a = pixelMatrix[y][x * bytePerPixel + 3]; - return pixel; -} - -uint8_t ImageBackend::GetIndexedPixel(size_t y, size_t x) const -{ - assert(y < height); - assert(x < width); - assert(isColorIndexed); - - return pixelMatrix[y][x]; -} - -void ImageBackend::SetRGBPixel(size_t y, size_t x, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA) -{ - assert(hasImageData); - assert(y < height); - assert(x < width); - - size_t bytePerPixel = GetBytesPerPixel(); - pixelMatrix[y][x * bytePerPixel + 0] = nR; - pixelMatrix[y][x * bytePerPixel + 1] = nG; - pixelMatrix[y][x * bytePerPixel + 2] = nB; - if (colorType == PNG_COLOR_TYPE_RGBA) - pixelMatrix[y][x * bytePerPixel + 3] = nA; -} - -void ImageBackend::SetGrayscalePixel(size_t y, size_t x, uint8_t grayscale, uint8_t alpha) -{ - assert(hasImageData); - assert(y < height); - assert(x < width); - - size_t bytePerPixel = GetBytesPerPixel(); - pixelMatrix[y][x * bytePerPixel + 0] = grayscale; - pixelMatrix[y][x * bytePerPixel + 1] = grayscale; - pixelMatrix[y][x * bytePerPixel + 2] = grayscale; - if (colorType == PNG_COLOR_TYPE_RGBA) - pixelMatrix[y][x * bytePerPixel + 3] = alpha; -} - -void ImageBackend::SetIndexedPixel(size_t y, size_t x, uint8_t index, uint8_t grayscale) -{ - assert(hasImageData); - assert(y < height); - assert(x < width); - - size_t bytePerPixel = GetBytesPerPixel(); - pixelMatrix[y][x * bytePerPixel + 0] = index; - - assert(index < paletteSize); - png_color* pal = static_cast(colorPalette); - pal[index].red = grayscale; - pal[index].green = grayscale; - pal[index].blue = grayscale; - alphaPalette[index] = 255; -} - -void ImageBackend::SetPaletteIndex(size_t index, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA) -{ - assert(isColorIndexed); - assert(index < paletteSize); - - png_color* pal = static_cast(colorPalette); - pal[index].red = nR; - pal[index].green = nG; - pal[index].blue = nB; - alphaPalette[index] = nA; -} - -void ImageBackend::SetPalette(const ImageBackend& pal, uint32_t offset) -{ - assert(isColorIndexed); - size_t bytePerPixel = pal.GetBytesPerPixel(); - - for (size_t y = 0; y < pal.height; y++) - { - for (size_t x = 0; x < pal.width; x++) - { - size_t index = y * pal.width + x; - if (index >= paletteSize) - { - /* - * Some TLUTs are bigger than 256 colors. - * For those cases, we will only take the first 256 - * to colorize this CI texture. - */ - return; - } - - uint8_t r = pal.pixelMatrix[y][x * bytePerPixel + 0]; - uint8_t g = pal.pixelMatrix[y][x * bytePerPixel + 1]; - uint8_t b = pal.pixelMatrix[y][x * bytePerPixel + 2]; - uint8_t a = pal.pixelMatrix[y][x * bytePerPixel + 3]; - SetPaletteIndex(index + offset, r, g, b, a); - } - } -} - -uint32_t ImageBackend::GetWidth() const -{ - return width; -} - -uint32_t ImageBackend::GetHeight() const -{ - return height; -} - -uint8_t ImageBackend::GetColorType() const -{ - return colorType; -} - -uint8_t ImageBackend::GetBitDepth() const -{ - return bitDepth; -} - -double ImageBackend::GetBytesPerPixel() const -{ - switch (colorType) - { - case PNG_COLOR_TYPE_RGBA: - return 4 * bitDepth / 8; - - case PNG_COLOR_TYPE_RGB: - return 3 * bitDepth / 8; - - case PNG_COLOR_TYPE_PALETTE: - return 1 * bitDepth / 8; - - default: - HANDLE_ERROR(WarningType::InvalidPNG, "invalid color type", ""); - } -} - -void ImageBackend::FreeImageData() -{ - if (hasImageData) - { - for (size_t y = 0; y < height; y++) - free(pixelMatrix[y]); - free(pixelMatrix); - pixelMatrix = nullptr; - } - - if (isColorIndexed) - { - free(colorPalette); - free(alphaPalette); - colorPalette = nullptr; - alphaPalette = nullptr; - isColorIndexed = false; - } - - hasImageData = false; -} - -/* RGBAPixel */ - -void RGBAPixel::SetRGBA(uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA) -{ - r = nR; - g = nG; - b = nB; - a = nA; -} - -void RGBAPixel::SetGrayscale(uint8_t grayscale, uint8_t alpha) -{ - r = grayscale; - g = grayscale; - b = grayscale; - a = alpha; -} diff --git a/ZAPDTR/ZAPD/ImageBackend.h b/ZAPDTR/ZAPD/ImageBackend.h deleted file mode 100644 index 0b1f4806c..000000000 --- a/ZAPDTR/ZAPD/ImageBackend.h +++ /dev/null @@ -1,72 +0,0 @@ -#pragma once - -#include -#include - -#include "Utils/Directory.h" - -class RGBAPixel -{ -public: - RGBAPixel() = default; - - void SetRGBA(uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA); - void SetGrayscale(uint8_t grayscale, uint8_t alpha = 0); - - uint8_t r = 0; - uint8_t g = 0; - uint8_t b = 0; - uint8_t a = 0; -}; - -class ImageBackend -{ -public: - ImageBackend() = default; - ~ImageBackend(); - - void ReadPng(const char* filename); - void ReadPng(const fs::path& filename); - void WritePng(const char* filename); - void WritePng(const fs::path& filename); - - void SetTextureData(const std::vector>& texData, uint32_t nWidth, - uint32_t nHeight, uint8_t nColorType, uint8_t nBitDepth); - void InitEmptyRGBImage(uint32_t nWidth, uint32_t nHeight, bool alpha); - void InitEmptyPaletteImage(uint32_t nWidth, uint32_t nHeight); - - RGBAPixel GetPixel(size_t y, size_t x) const; - uint8_t GetIndexedPixel(size_t y, size_t x) const; - - void SetRGBPixel(size_t y, size_t x, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA = 0); - void SetGrayscalePixel(size_t y, size_t x, uint8_t grayscale, uint8_t alpha = 0); - - void SetIndexedPixel(size_t y, size_t x, uint8_t index, uint8_t grayscale); - void SetIndexedPixel(size_t y, size_t x, uint8_t index, RGBAPixel pixel); - void SetPaletteIndex(size_t index, uint8_t nR, uint8_t nG, uint8_t nB, uint8_t nA); - void SetPalette(const ImageBackend& pal, uint32_t offset = 0); - - uint32_t GetWidth() const; - uint32_t GetHeight() const; - uint8_t GetColorType() const; - uint8_t GetBitDepth() const; - -protected: - uint8_t** pixelMatrix = nullptr; // height * [width * bytePerPixel] - - void* colorPalette = nullptr; - uint8_t* alphaPalette = nullptr; - size_t paletteSize = 16 * 16; - - uint32_t width = 0; - uint32_t height = 0; - uint8_t colorType = 0; - uint8_t bitDepth = 0; - - bool hasImageData = false; - bool isColorIndexed = false; - - double GetBytesPerPixel() const; - - void FreeImageData(); -}; diff --git a/ZAPDTR/ZAPD/Main.cpp b/ZAPDTR/ZAPD/Main.cpp deleted file mode 100644 index a2030aaa4..000000000 --- a/ZAPDTR/ZAPD/Main.cpp +++ /dev/null @@ -1,594 +0,0 @@ -#include "Globals.h" -#include "Utils/Directory.h" -#include -#include "Utils/Path.h" -#include "WarningHandler.h" - -#include "ZAnimation.h" -ZNormalAnimation nAnim(nullptr); -ZCurveAnimation cAnim(nullptr); -ZLinkAnimation lAnim(nullptr); -ZLegacyAnimation lAnim2(nullptr); - -#include "ZArray.h" -ZArray arr(nullptr); - -#include "ZAudio.h" -ZAudio audio(nullptr); - -#include "ZBackground.h" -ZBackground back(nullptr); - -#include "ZBlob.h" -ZBlob blob(nullptr); - -#include "ZCollision.h" -ZCollisionHeader colHeader(nullptr); - -#include "ZCutscene.h" -ZCutscene cs(nullptr); - -#include "ZLimb.h" -ZLimb limb(nullptr); - -#include "ZMtx.h" -ZMtx mtx(nullptr); - -#include "ZPath.h" -ZPath path(nullptr); - -#include "ZPlayerAnimationData.h" -ZPlayerAnimationData pAnimData(nullptr); - -#include "ZScalar.h" -ZScalar scalar(nullptr); - -#include "ZSkeleton.h" -ZLimbTable limbTbl(nullptr); -ZSkeleton skel(nullptr); - -#include "ZString.h" -ZString str(nullptr); - -#include "ZSymbol.h" -ZSymbol sym(nullptr); - -#include "ZText.h" -ZText txt(nullptr); - -#include "ZTexture.h" -ZTexture tex(nullptr); - -#include "ZVector.h" -ZVector vec(nullptr); - -#include "ZVtx.h" -ZVtx vtx(nullptr); - -#include "ZRoom/ZRoom.h" -ZRoom room(nullptr); - -#include "ZFile.h" -#include "ZTexture.h" - -#include "CrashHandler.h" - -#include -#include -#include "tinyxml2.h" -#include - -//extern const char gBuildHash[]; -const char gBuildHash[] = ""; - -bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path& outPath, - ZFileMode fileMode, int workerID); - -void BuildAssetTexture(const fs::path& pngFilePath, TextureType texType, const fs::path& outPath); -void BuildAssetBackground(const fs::path& imageFilePath, const fs::path& outPath); -void BuildAssetBlob(const fs::path& blobFilePath, const fs::path& outPath); -int ExtractFunc(int workerID, int fileListSize, std::string fileListItem, ZFileMode fileMode); - -volatile int numWorkersLeft = 0; - -extern void ImportExporters(); - -extern "C" int zapd_main(int argc, char* argv[]) -{ - // Syntax: ZAPD.out [mode (btex/bovl/e)] (Arbritrary Number of Arguments) - - if (argc < 2) - { - printf("ZAPD.out (%s) [mode (btex/bovl/bsf/bblb/bmdlintr/bamnintr/e)] ...\n", gBuildHash); - return 1; - } - - Globals* g = new Globals(); - WarningHandler::Init(argc, argv); - - for (int i = 1; i < argc; i++) - { - if (!strcmp(argv[i], "--version")) - { - printf("ZAPD.out %s\n", gBuildHash); - return 0; - } - else if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h")) - { - printf("Congratulations!\n"); - printf("You just found the (unimplemented and undocumented) ZAPD's help message.\n"); - printf("Feel free to implement it if you want :D\n"); - - WarningHandler::PrintHelp(); - return 0; - } - } - - // Parse other "commands" - for (int32_t i = 2; i < argc; i++) - { - std::string arg = argv[i]; - - if (arg == "-o" || arg == "--outputpath") // Set output path - { - Globals::Instance->outputPath = argv[++i]; - - if (Globals::Instance->sourceOutputPath == "") - Globals::Instance->sourceOutputPath = Globals::Instance->outputPath; - } - else if (arg == "-i" || arg == "--inputpath") // Set input path - { - Globals::Instance->inputPath = argv[++i]; - } - else if (arg == "-b" || arg == "--baserompath") // Set baserom path - { - Globals::Instance->baseRomPath = argv[++i]; - } - else if (arg == "-osf") // Set source output path - { - Globals::Instance->sourceOutputPath = argv[++i]; - } - else if (arg == "-gsf") // Generate source file during extraction - { - Globals::Instance->genSourceFile = std::string_view(argv[++i]) == "1"; - } - else if (arg == "-tm") // Test Mode (enables certain experimental features) - { - Globals::Instance->testMode = std::string_view(argv[++i]) == "1"; - } - else if (arg == "-crc" || - arg == "--output-crc") // Outputs a CRC file for each extracted texture. - { - Globals::Instance->testMode = std::string_view(argv[++i]) == "1"; - } - else if (arg == "-ulzdl") // Use Legacy ZDisplay List - { - Globals::Instance->useLegacyZDList = std::string_view(argv[++i]) == "1"; - } - else if (arg == "-profile") // Enable profiling - { - Globals::Instance->profile = std::string_view(argv[++i]) == "1"; - } - else if (arg == - "-uer") // Split resources into their individual components (enabled by default) - // TODO: We may wish to make this a part of the config file... - { - Globals::Instance->useExternalResources = std::string_view(argv[++i]) == "1"; - } - else if (arg == "-tt") // Set texture type - { - Globals::Instance->texType = ZTexture::GetTextureTypeFromString(argv[++i]); - } - else if (arg == "-fl") // Set baserom filelist path - { - Globals::Instance->fileListPath = argv[++i]; - } - else if (arg == "-rconf") // Read Config File - { - Globals::Instance->cfg.ReadConfigFile(argv[++i]); - } - else if (arg == "-eh") // Enable Error Handler - { - CrashHandler_Init(); - } - else if (arg == "-v") // Verbose - { - Globals::Instance->verbosity = static_cast(strtol(argv[++i], NULL, 16)); - } - else if (arg == "-vu" || arg == "--verbose-unaccounted") // Verbose unaccounted - { - Globals::Instance->verboseUnaccounted = true; - } - else if (arg == "-se" || arg == "--set-exporter") // Set Current Exporter - { - ImportExporters(); - Globals::Instance->currentExporter = argv[++i]; - } - else if (arg == "--gcc-compat") // GCC compatibility - { - Globals::Instance->gccCompat = true; - } - else if (arg == "-s" || arg == "--static") - { - Globals::Instance->forceStatic = true; - } - else if (arg == "-us" || arg == "--unaccounted-static") - { - Globals::Instance->forceUnaccountedStatic = true; - } - else if (arg == "-brt" || arg == "--build-raw-texture") - { - Globals::Instance->buildRawTexture = true; - } - else if (arg == "--norom") - { - Globals::Instance->onlyGenSohOtr = true; - } - } - - - // Parse File Mode - ExporterSet* exporterSet = Globals::Instance->GetExporterSet(); - - if(Globals::Instance->onlyGenSohOtr) { - exporterSet->endProgramFunc(); - - delete g; - return 0; - } - - std::string buildMode = argv[1]; - ZFileMode fileMode = ZFileMode::Invalid; - - if (buildMode == "btex") - fileMode = ZFileMode::BuildTexture; - else if (buildMode == "bren") - fileMode = ZFileMode::BuildBackground; - else if (buildMode == "bsf") - fileMode = ZFileMode::BuildSourceFile; - else if (buildMode == "bblb") - fileMode = ZFileMode::BuildBlob; - else if (buildMode == "e") - fileMode = ZFileMode::Extract; - else if (buildMode == "ed") - fileMode = ZFileMode::ExtractDirectory; - else if (exporterSet != nullptr && exporterSet->parseFileModeFunc != nullptr) - exporterSet->parseFileModeFunc(buildMode, fileMode); - - if (fileMode == ZFileMode::Invalid) - { - printf("Error: Invalid file mode '%s'\n", buildMode.c_str()); - return 1; - } - - Globals::Instance->fileMode = fileMode; - - if (fileMode == ZFileMode::ExtractDirectory) - Globals::Instance->rom = new ZRom(Globals::Instance->baseRomPath.string()); - - // We've parsed through our commands once. If an exporter exists, it's been set by now. - // Now we'll parse through them again but pass them on to our exporter if one is available. - - if (exporterSet != nullptr && exporterSet->parseArgsFunc != nullptr) - { - for (int32_t i = 2; i < argc; i++) - exporterSet->parseArgsFunc(argc, argv, i); - } - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - printf("ZAPD: Zelda Asset Processor For Decomp: %s\n", gBuildHash); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - WarningHandler::PrintWarningsDebugInfo(); - } - - // TODO: switch - if (fileMode == ZFileMode::Extract || fileMode == ZFileMode::BuildSourceFile || fileMode == ZFileMode::ExtractDirectory) - { - bool procFileModeSuccess = false; - - if (exporterSet != nullptr && exporterSet->processFileModeFunc != nullptr) - procFileModeSuccess = exporterSet->processFileModeFunc(fileMode); - - if (!procFileModeSuccess) - { - if (fileMode == ZFileMode::ExtractDirectory) - { - std::vector fileList = - Directory::ListFiles(Globals::Instance->inputPath.string()); - - const int num_threads = std::thread::hardware_concurrency(); - ctpl::thread_pool pool(num_threads > 1 ? num_threads / 2 : 1); - - bool parseSuccessful; - - auto start = std::chrono::steady_clock::now(); - int fileListSize = fileList.size(); - Globals::Instance->singleThreaded = false; - - for (int i = 0; i < fileListSize; i++) - Globals::Instance->workerData[i] = new FileWorker(); - - numWorkersLeft = fileListSize; - - for (int i = 0; i < fileListSize; i++) - { - if (Globals::Instance->singleThreaded) - { - ExtractFunc(i, fileList.size(), fileList[i], fileMode); - } - else - { - std::string fileListItem = fileList[i]; - pool.push([i, fileListSize, fileListItem, fileMode](int) { - ExtractFunc(i, fileListSize, fileListItem, fileMode); - }); - } - } - - if (!Globals::Instance->singleThreaded) - { - while (true) - { - if (numWorkersLeft <= 0) - break; - - std::this_thread::sleep_for(std::chrono::milliseconds(250)); - } - } - - auto end = std::chrono::steady_clock::now(); - auto diff = - std::chrono::duration_cast(end - start).count(); - - printf("Generated OTR File Data in %i seconds\n", diff); - } - else - { - bool parseSuccessful; - - for (auto& extFile : Globals::Instance->cfg.externalFiles) - { - fs::path externalXmlFilePath = - Globals::Instance->cfg.externalXmlFolder / extFile.xmlPath; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - { - printf("Parsing external file from config: '%s'\n", - externalXmlFilePath.c_str()); - } - - parseSuccessful = Parse(externalXmlFilePath, Globals::Instance->baseRomPath, - extFile.outPath, ZFileMode::ExternalFile, 0); - - if (!parseSuccessful) - return 1; - } - - parseSuccessful = - Parse(Globals::Instance->inputPath, Globals::Instance->baseRomPath, - Globals::Instance->outputPath, fileMode, 0); - if (!parseSuccessful) - return 1; - } - } - } - else if (fileMode == ZFileMode::BuildTexture) - { - TextureType texType = Globals::Instance->texType; - BuildAssetTexture(Globals::Instance->inputPath, texType, Globals::Instance->outputPath); - } - else if (fileMode == ZFileMode::BuildBackground) - { - BuildAssetBackground(Globals::Instance->inputPath, Globals::Instance->outputPath); - } - else if (fileMode == ZFileMode::BuildBlob) - { - BuildAssetBlob(Globals::Instance->inputPath, Globals::Instance->outputPath); - } - - if (exporterSet != nullptr && exporterSet->endProgramFunc != nullptr) - exporterSet->endProgramFunc(); - -end: - delete exporterSet; - - //Globals::Instance->GetExporterSet() = nullptr; //TODO NULL this out. Compiler complains about lvalue assignment. - - delete g; - return 0; -} - -int ExtractFunc(int workerID, int fileListSize, std::string fileListItem, ZFileMode fileMode) -{ - bool parseSuccessful; - - printf("(%i / %i): %s\n", (workerID + 1), fileListSize, fileListItem.c_str()); - - for (auto& extFile : Globals::Instance->cfg.externalFiles) - { - fs::path externalXmlFilePath = Globals::Instance->cfg.externalXmlFolder / extFile.xmlPath; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - { - printf("Parsing external file from config: '%s'\n", externalXmlFilePath.c_str()); - } - - parseSuccessful = Parse(externalXmlFilePath, Globals::Instance->baseRomPath, - extFile.outPath, ZFileMode::ExternalFile, workerID); - - if (!parseSuccessful) - return 1; - } - - parseSuccessful = Parse(fileListItem, Globals::Instance->baseRomPath, - Globals::Instance->outputPath, fileMode, workerID); - - if (!parseSuccessful) - return 1; - - if (Globals::Instance->singleThreaded) - { - for (int i = 0; i < Globals::Instance->files.size(); i++) - { - delete Globals::Instance->files[i]; - Globals::Instance->files.erase(Globals::Instance->files.begin() + i); - i--; - } - - Globals::Instance->externalFiles.clear(); - Globals::Instance->segments.clear(); - Globals::Instance->cfg.segmentRefFiles.clear(); - } - else - { - for (int i = 0; i < Globals::Instance->workerData[workerID]->files.size(); i++) - { - delete Globals::Instance->workerData[workerID]->files[i]; - Globals::Instance->workerData[workerID]->files.erase( - Globals::Instance->workerData[workerID]->files.begin() + - i); - i--; - } - - Globals::Instance->workerData[workerID]->externalFiles.clear(); - Globals::Instance->workerData[workerID]->segments.clear(); - Globals::Instance->workerData[workerID]->segmentRefFiles.clear(); - - numWorkersLeft--; - } - return 0; -} - -bool Parse(const fs::path& xmlFilePath, const fs::path& basePath, const fs::path& outPath, - ZFileMode fileMode, int workerID) -{ - tinyxml2::XMLDocument doc; - tinyxml2::XMLError eResult = doc.LoadFile(xmlFilePath.string().c_str()); - - if (eResult != tinyxml2::XML_SUCCESS) - { - // TODO: use XMLDocument::ErrorIDToName to get more specific error messages here - HANDLE_ERROR(WarningType::InvalidXML, - StringHelper::Sprintf("invalid XML file: '%s'", xmlFilePath.c_str()), ""); - return false; - } - - tinyxml2::XMLNode* root = doc.FirstChild(); - - if (root == nullptr) - { - HANDLE_WARNING( - WarningType::InvalidXML, - StringHelper::Sprintf("missing Root tag in xml file: '%s'", xmlFilePath.c_str()), ""); - return false; - } - - for (tinyxml2::XMLElement* child = root->FirstChildElement(); child != NULL; - child = child->NextSiblingElement()) - { - if (std::string_view(child->Name()) == "File") - { - ZFile* file = new ZFile(fileMode, child, basePath, outPath, "", xmlFilePath, workerID); - Globals::Instance->AddFile(file, workerID); - if (fileMode == ZFileMode::ExternalFile) - { - Globals::Instance->AddExternalFile(file, workerID); - file->isExternalFile = true; - } - } - else if (std::string(child->Name()) == "ExternalFile") - { - const char* xmlPathValue = child->Attribute("XmlPath"); - if (xmlPathValue == nullptr) - { - throw std::runtime_error(StringHelper::Sprintf( - "Parse: Fatal error in '%s'.\n" - "\t Missing 'XmlPath' attribute in `ExternalFile` element.\n", - xmlFilePath.c_str())); - } - const char* outPathValue = child->Attribute("OutPath"); - if (outPathValue == nullptr) - { - throw std::runtime_error(StringHelper::Sprintf( - "Parse: Fatal error in '%s'.\n" - "\t Missing 'OutPath' attribute in `ExternalFile` element.\n", - xmlFilePath.c_str())); - } - - fs::path externalXmlFilePath = - Globals::Instance->cfg.externalXmlFolder / fs::path(xmlPathValue); - fs::path externalOutFilePath = fs::path(outPathValue); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - { - printf("Parsing external file: '%s'\n", externalXmlFilePath.c_str()); - } - - // Recursion. What can go wrong? - Parse(externalXmlFilePath, basePath, externalOutFilePath, ZFileMode::ExternalFile, workerID); - } - else - { - std::string errorHeader = - StringHelper::Sprintf("when parsing file '%s'", xmlFilePath.c_str()); - std::string errorBody = StringHelper::Sprintf( - "Found a resource outside a File element: '%s'", child->Name()); - HANDLE_ERROR(WarningType::InvalidXML, errorHeader, errorBody); - } - } - - if (fileMode != ZFileMode::ExternalFile) - { - ExporterSet* exporterSet = Globals::Instance->GetExporterSet(); - - if (exporterSet != nullptr && exporterSet->beginXMLFunc != nullptr) - exporterSet->beginXMLFunc(); - - std::vector files; - - if (Globals::Instance->singleThreaded) - files = Globals::Instance->files; - else - files = Globals::Instance->workerData[workerID]->files; - - for (ZFile* file : files) - { - if (fileMode == ZFileMode::BuildSourceFile) - file->BuildSourceFile(); - else - file->ExtractResources(); - } - - if (exporterSet != nullptr && exporterSet->endXMLFunc != nullptr) - exporterSet->endXMLFunc(); - } - - return true; -} - -void BuildAssetTexture(const fs::path& pngFilePath, TextureType texType, const fs::path& outPath) -{ - return Globals::Instance->BuildAssetTexture(pngFilePath, texType, outPath); -} - -void BuildAssetBackground(const fs::path& imageFilePath, const fs::path& outPath) -{ - ZBackground background(nullptr); - background.ParseBinaryFile(imageFilePath.string(), false); - - DiskFile::WriteAllText(outPath.string(), background.GetBodySourceCode()); -} - -void BuildAssetBlob(const fs::path& blobFilePath, const fs::path& outPath) -{ - ZBlob* blob = ZBlob::FromFile(blobFilePath.string()); - std::string name = outPath.stem().string(); // filename without extension - - std::string src = blob->GetBodySourceCode(); - - DiskFile::WriteAllText(outPath.string(), src); - - delete blob; -} diff --git a/ZAPDTR/ZAPD/NuGet/libpng.static.txt b/ZAPDTR/ZAPD/NuGet/libpng.static.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.cpp b/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.cpp deleted file mode 100644 index edefbc051..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.cpp +++ /dev/null @@ -1,213 +0,0 @@ -#include "CutsceneMM_Commands.h" - -#include -#include - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -// Specific for command lists where each entry has size 8 bytes -const std::unordered_map csCommandsDescMM = { - {CutsceneMMCommands::CS_CMD_MISC, {"CS_MISC", "(0x%02X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_SET_LIGHTING, {"CS_LIGHTING", "(0x%02X, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_SCENE_TRANS_FX, {"CS_SCENE_TRANS_FX", "(%i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_MOTIONBLUR, {"CS_MOTIONBLUR", "(%i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_GIVETATL, {"CS_GIVETATL", "(%i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_PLAYSEQ, {"CS_PLAYSEQ", "(0x%04X, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_130, {"CS_SCENE_UNK_130", "(0x%04X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_131, {"CS_SCENE_UNK_131", "(0x%04X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_132, {"CS_SCENE_UNK_132", "(%i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_STOPSEQ, {"CS_STOPSEQ", "(0x%04X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_PLAYAMBIENCE, {"CS_PLAYAMBIENCE", "(0x%04X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_FADEAMBIENCE, {"CS_FADEAMBIENCE", "(0x%04X, %i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_TERMINATOR, {"CS_TERMINATOR", "(%i, %i, %i)"}}, - {CutsceneMMCommands::CS_CMD_CHOOSE_CREDITS_SCENES, - {"CS_CHOOSE_CREDITS_SCENES", "(%i, %i, %i)"}}, -}; - -CutsceneSubCommandEntry_GenericMMCmd::CutsceneSubCommandEntry_GenericMMCmd( - const std::vector& rawData, offset_t rawDataIndex, CutsceneMMCommands cmdId) - : CutsceneSubCommandEntry(rawData, rawDataIndex), commandId(cmdId) -{ -} - -std::string CutsceneSubCommandEntry_GenericMMCmd::GetBodySourceCode() const -{ - const auto& element = csCommandsDescMM.find(commandId); - std::string entryFmt = "CS_UNK_DATA(0x%02X, %i, %i, %i)"; - - if (element != csCommandsDescMM.end()) - { - entryFmt = element->second.cmdMacro; - entryFmt += element->second.args; - } - - return StringHelper::Sprintf(entryFmt.c_str(), base, startFrame, endFrame, pad); -} - -CutsceneMMCommand_GenericCmd::CutsceneMMCommand_GenericCmd(const std::vector& rawData, - offset_t rawDataIndex, - CutsceneMMCommands cmdId) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - commandID = static_cast(cmdId); - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_GenericMMCmd(rawData, rawDataIndex, cmdId); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneMMCommand_GenericCmd::GetCommandMacro() const -{ - const auto& element = csCommandsDescMM.find(static_cast(commandID)); - - if (element != csCommandsDescMM.end()) - { - return StringHelper::Sprintf("%s_LIST(%i)", element->second.cmdMacro, numEntries); - } - - return StringHelper::Sprintf("CS_UNK_DATA_LIST(0x%X, %i)", commandID, numEntries); -} - -CutsceneSubCommandEntry_Camera::CutsceneSubCommandEntry_Camera(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ -} - -std::string CutsceneSubCommandEntry_Camera::GetBodySourceCode() const -{ - return StringHelper::Sprintf("CMD_HH(0x%04X, 0x%04X)", base, startFrame); -} - -size_t CutsceneSubCommandEntry_Camera::GetRawSize() const -{ - return 0x04; -} - -CutsceneMMCommand_Camera::CutsceneMMCommand_Camera(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries / 4; i++) - { - auto* entry = new CutsceneSubCommandEntry_Camera(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneMMCommand_Camera::GetCommandMacro() const -{ - return StringHelper::Sprintf("CS_CAMERA_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_FadeScreen::CutsceneSubCommandEntry_FadeScreen( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - unk_06 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x06); - unk_07 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x07); - unk_08 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x08); - unk_09 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x09); - unk_0A = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x0A); - unk_0B = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x0B); -} - -std::string CutsceneSubCommandEntry_FadeScreen::GetBodySourceCode() const -{ - return StringHelper::Sprintf("CS_FADESCREEN(0x%02X, %i, %i, %i, %i, %i)", base, startFrame, - endFrame, unk_06, unk_07, unk_08); -} - -size_t CutsceneSubCommandEntry_FadeScreen::GetRawSize() const -{ - return 0x0C; -} - -CutsceneMMCommand_FadeScreen::CutsceneMMCommand_FadeScreen(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_FadeScreen(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneMMCommand_FadeScreen::GetCommandMacro() const -{ - return StringHelper::Sprintf("CS_FADESCREEN_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_FadeSeq::CutsceneSubCommandEntry_FadeSeq( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - unk_08 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); -} - -std::string CutsceneSubCommandEntry_FadeSeq::GetBodySourceCode() const -{ - return StringHelper::Sprintf("CS_FADESEQ(%i, %i, %i)", base, startFrame, endFrame); -} - -size_t CutsceneSubCommandEntry_FadeSeq::GetRawSize() const -{ - return 0x0C; -} - -CutsceneMMCommand_FadeSeq::CutsceneMMCommand_FadeSeq(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_FadeSeq(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneMMCommand_FadeSeq::GetCommandMacro() const -{ - return StringHelper::Sprintf("CS_FADESEQ_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_NonImplemented::CutsceneSubCommandEntry_NonImplemented( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ -} - -CutsceneMMCommand_NonImplemented::CutsceneMMCommand_NonImplemented( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_NonImplemented(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} diff --git a/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.h b/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.h deleted file mode 100644 index c8ae4eb60..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/CutsceneMM_Commands.h +++ /dev/null @@ -1,140 +0,0 @@ -#pragma once - -#include "Cutscene_Commands.h" - -enum class CutsceneMMCommands -{ - /* 0x00A */ CS_CMD_TEXTBOX = 0xA, - /* 0x05A */ CS_CMD_CAMERA = 0x5A, - /* 0x096 */ CS_CMD_MISC = 0x96, - /* 0x097 */ CS_CMD_SET_LIGHTING, - /* 0x098 */ CS_CMD_SCENE_TRANS_FX, - /* 0x099 */ CS_CMD_MOTIONBLUR, - /* 0x09A */ CS_CMD_GIVETATL, - /* 0x09B */ CS_CMD_FADESCREEN, - /* 0x09C */ CS_CMD_FADESEQ, - /* 0x09D */ CS_CMD_SETTIME, - /* 0x0C8 */ CS_CMD_SET_PLAYER_ACTION = 0xC8, - /* 0x0FA */ CS_CMD_UNK_FA = 0xFA, - /* 0x0FE */ CS_CMD_UNK_FE = 0xFE, - /* 0x0FF */ CS_CMD_UNK_FF, - /* 0x100 */ CS_CMD_UNK_100, - /* 0x101 */ CS_CMD_UNK_101, - /* 0x102 */ CS_CMD_UNK_102, - /* 0x103 */ CS_CMD_UNK_103, - /* 0x104 */ CS_CMD_UNK_104, - /* 0x105 */ CS_CMD_UNK_105, - /* 0x108 */ CS_CMD_UNK_108 = 0x108, - /* 0x109 */ CS_CMD_UNK_109, - /* 0x12C */ CS_CMD_PLAYSEQ = 0x12C, - /* 0x12D */ CS_CMD_UNK_12D, - /* 0x130 */ CS_CMD_130 = 0x130, - /* 0x131 */ CS_CMD_131 = 0x131, - /* 0x132 */ CS_CMD_132 = 0x132, - /* 0x133 */ CS_CMD_STOPSEQ, - /* 0x134 */ CS_CMD_PLAYAMBIENCE, - /* 0x135 */ CS_CMD_FADEAMBIENCE, - /* 0x15E */ CS_CMD_TERMINATOR = 0x15E, - /* 0x15F */ CS_CMD_CHOOSE_CREDITS_SCENES, - /* 0x190 */ CS_CMD_RUMBLE = 0x190, -}; - -class CutsceneSubCommandEntry_GenericMMCmd : public CutsceneSubCommandEntry -{ -public: - CutsceneMMCommands commandId; - - CutsceneSubCommandEntry_GenericMMCmd(const std::vector& rawData, offset_t rawDataIndex, - CutsceneMMCommands cmdId); - - std::string GetBodySourceCode() const override; -}; - -class CutsceneMMCommand_GenericCmd : public CutsceneCommand -{ -public: - CutsceneMMCommand_GenericCmd(const std::vector& rawData, offset_t rawDataIndex, - CutsceneMMCommands cmdId); - - std::string GetCommandMacro() const override; -}; - -// TODO: MM cutscene camera command is implemented as a placeholder until we better understand how -// it works -class CutsceneSubCommandEntry_Camera : public CutsceneSubCommandEntry -{ -public: - uint32_t unk_08; - - CutsceneSubCommandEntry_Camera(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneMMCommand_Camera : public CutsceneCommand -{ -public: - CutsceneMMCommand_Camera(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_FadeScreen : public CutsceneSubCommandEntry -{ -public: - uint8_t unk_06; - uint8_t unk_07; - uint8_t unk_08; - uint8_t unk_09; - uint8_t unk_0A; - uint8_t unk_0B; - - CutsceneSubCommandEntry_FadeScreen(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneMMCommand_FadeScreen : public CutsceneCommand -{ -public: - CutsceneMMCommand_FadeScreen(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_FadeSeq : public CutsceneSubCommandEntry -{ -public: - uint32_t unk_08; - - CutsceneSubCommandEntry_FadeSeq(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneMMCommand_FadeSeq : public CutsceneCommand -{ -public: - CutsceneMMCommand_FadeSeq(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_NonImplemented : public CutsceneSubCommandEntry -{ -public: - CutsceneSubCommandEntry_NonImplemented(const std::vector& rawData, - offset_t rawDataIndex); -}; - -class CutsceneMMCommand_NonImplemented : public CutsceneCommand -{ -public: - CutsceneMMCommand_NonImplemented(const std::vector& rawData, offset_t rawDataIndex); -}; diff --git a/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.cpp b/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.cpp deleted file mode 100644 index 8ae4c69d7..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.cpp +++ /dev/null @@ -1,596 +0,0 @@ -#include "Cutscene_Commands.h" - -#include -#include - -#include "CutsceneMM_Commands.h" -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -/* CutsceneSubCommandEntry */ - -CutsceneSubCommandEntry::CutsceneSubCommandEntry(const std::vector& rawData, - offset_t rawDataIndex) -{ - base = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); - startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - endFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4); - pad = BitConverter::ToUInt16BE(rawData, rawDataIndex + 6); -} - -std::string CutsceneSubCommandEntry::GetBodySourceCode() const -{ - return StringHelper::Sprintf("CMD_HH(0x%04X, 0x%04X), CMD_HH(0x%04X, 0x%04X)", base, startFrame, - endFrame, pad); -} - -size_t CutsceneSubCommandEntry::GetRawSize() const -{ - return 0x08; -} - -/* CutsceneCommand */ - -CutsceneCommand::CutsceneCommand(const std::vector& rawData, offset_t rawDataIndex) -{ - numEntries = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0); -} - -CutsceneCommand::~CutsceneCommand() -{ - for (auto& entry : entries) - { - delete entry; - } -} - -std::string CutsceneCommand::GetCommandMacro() const -{ - return StringHelper::Sprintf("CMD_W(0x%08X), CMD_W(0x%08X)", commandID, numEntries); -} - -std::string CutsceneCommand::GenerateSourceCode() const -{ - std::string result; - - result += GetCommandMacro(); - result += ",\n"; - - for (auto& entry : entries) - { - result += " "; - result += entry->GetBodySourceCode(); - result += ",\n"; - } - - return result; -} - -size_t CutsceneCommand::GetCommandSize() const -{ - size_t size = 0; - if (entries.size() > 0) - { - size = entries.at(0)->GetRawSize() * entries.size(); - } - else - { - size = 0x08 * numEntries; - } - return 0x08 + size; -} - -void CutsceneCommand::SetCommandID(uint32_t nCommandID) -{ - commandID = nCommandID; - - for (auto& entry : entries) - { - entry->commandID = commandID; - } -} - -// Specific for command lists where each entry has size 0x30 bytes -const std::unordered_map csCommandsDesc = { - {CutsceneCommands::Misc, - {"CS_MISC", "(0x%04X, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}}, - {CutsceneCommands::SetLighting, - {"CS_LIGHTING", "(0x%02X, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}}, - {CutsceneCommands::PlayBGM, {"CS_PLAY_BGM", "(%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}}, - {CutsceneCommands::StopBGM, {"CS_STOP_BGM", "(%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}}, - {CutsceneCommands::FadeBGM, {"CS_FADE_BGM", "(%i, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i)"}}, -}; - -CutsceneSubCommandEntry_GenericCmd::CutsceneSubCommandEntry_GenericCmd( - const std::vector& rawData, offset_t rawDataIndex, CutsceneCommands cmdId) - : CutsceneSubCommandEntry(rawData, rawDataIndex), commandId(cmdId) -{ - word0 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x0); - word1 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x4); - - unused1 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x8); - unused2 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0xC); - unused3 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x10); - unused4 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x14); - unused5 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x18); - unused6 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x1C); - unused7 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x20); - unused8 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x24); - unused9 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x28); - unused10 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x2C); -} - -std::string CutsceneSubCommandEntry_GenericCmd::GetBodySourceCode() const -{ - const auto& element = csCommandsDesc.find(commandId); - - if (element != csCommandsDesc.end()) - { - std::string entryFmt = element->second.cmdMacro; - entryFmt += element->second.args; - - return StringHelper::Sprintf(entryFmt.c_str(), base, startFrame, endFrame, pad, unused1, - unused2, unused3, unused4, unused5, unused6, unused7, unused8, - unused9, unused10); - } - - return StringHelper::Sprintf("CS_UNK_DATA(0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, " - "0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X)", - word0, word1, unused1, unused2, unused3, unused4, unused5, unused6, - unused7, unused8, unused9, unused10); -} - -size_t CutsceneSubCommandEntry_GenericCmd::GetRawSize() const -{ - return 0x30; -} - -CutsceneCommand_GenericCmd::CutsceneCommand_GenericCmd(const std::vector& rawData, - offset_t rawDataIndex, - CutsceneCommands cmdId) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - commandID = static_cast(cmdId); - entries.reserve(numEntries); - - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_GenericCmd(rawData, rawDataIndex, cmdId); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneCommand_GenericCmd::GetCommandMacro() const -{ - const auto& element = csCommandsDesc.find(static_cast(commandID)); - - if (element != csCommandsDesc.end()) - { - return StringHelper::Sprintf("%s_LIST(%i)", element->second.cmdMacro, numEntries); - } - - return StringHelper::Sprintf("CS_UNK_DATA_LIST(0x%X, %i)", commandID, numEntries); -} - -CutsceneCameraPoint::CutsceneCameraPoint(const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - continueFlag = BitConverter::ToInt8BE(rawData, rawDataIndex + 0); - cameraRoll = BitConverter::ToInt8BE(rawData, rawDataIndex + 1); - nextPointFrame = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - viewAngle = BitConverter::ToFloatBE(rawData, rawDataIndex + 4); - - posX = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); - posY = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); - posZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 12); - - unused = BitConverter::ToInt16BE(rawData, rawDataIndex + 14); -} - -std::string CutsceneCameraPoint::GetBodySourceCode() const -{ - std::string result = ""; - - if (commandID == (int32_t)CutsceneCommands::SetCameraFocus) - { - result += "CS_CAM_FOCUS_POINT"; - } - else if (commandID == (int32_t)CutsceneCommands::SetCameraFocusLink) - { - result += "CS_CAM_FOCUS_POINT_PLAYER"; - } - else if (commandID == (int32_t)CutsceneCommands::SetCameraPosLink) - { - result += "CS_CAM_POS_PLAYER"; - } - else - { - result += "CS_CAM_POS"; - } - - std::string continueMacro = "CS_CMD_CONTINUE"; - if (continueFlag != 0) - continueMacro = "CS_CMD_STOP"; - - result += - StringHelper::Sprintf("(%s, 0x%02X, %i, %ff, %i, %i, %i, 0x%04X)", continueMacro.c_str(), - cameraRoll, nextPointFrame, viewAngle, posX, posY, posZ, unused); - return result; -} - -size_t CutsceneCameraPoint::GetRawSize() const -{ - return 0x10; -} - -CutsceneCommandSetCameraPos::CutsceneCommandSetCameraPos(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - base = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); - startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - endFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4); - unused = BitConverter::ToUInt16BE(rawData, rawDataIndex + 6); - - bool shouldContinue = true; - - uint32_t currentPtr = rawDataIndex + 8; - - while (shouldContinue) - { - CutsceneCameraPoint* camPoint = new CutsceneCameraPoint(rawData, currentPtr); - entries.push_back(camPoint); - - if (camPoint->continueFlag == -1) - shouldContinue = false; - - currentPtr += camPoint->GetRawSize(); - } -} - -std::string CutsceneCommandSetCameraPos::GetCommandMacro() const -{ - std::string result; - - std::string listStr; - - if (commandID == (int32_t)CutsceneCommands::SetCameraFocus) - { - listStr = "CS_CAM_FOCUS_POINT_LIST"; - } - else if (commandID == (int32_t)CutsceneCommands::SetCameraFocusLink) - { - listStr = "CS_CAM_FOCUS_POINT_PLAYER_LIST"; - } - else if (commandID == (int32_t)CutsceneCommands::SetCameraPosLink) - { - listStr = "CS_CAM_POS_PLAYER_LIST"; - } - else - { - listStr = "CS_CAM_POS_LIST"; - } - - result += StringHelper::Sprintf("%s(%i, %i)", listStr.c_str(), startFrame, endFrame); - - return result; -} - -size_t CutsceneCommandSetCameraPos::GetCommandSize() const -{ - return 0x0C + entries.at(0)->GetRawSize() * entries.size(); -} - -CutsceneSubCommandEntry_Rumble::CutsceneSubCommandEntry_Rumble(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - unk_06 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x06); - unk_07 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x07); - unk_08 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x08); - unk_09 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x09); - unk_0A = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x0A); - unk_0B = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x0B); -} - -std::string CutsceneSubCommandEntry_Rumble::GetBodySourceCode() const -{ - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - return StringHelper::Sprintf("CS_RUMBLE(%i, %i, %i, 0x%02X, 0x%02X, 0x%02X)", base, - startFrame, endFrame, unk_06, unk_07, unk_08); - } - - return StringHelper::Sprintf("CS_CMD_09(%i, %i, %i, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X)", - base, startFrame, endFrame, unk_06, unk_07, unk_08, unk_09, unk_0A, - unk_0B); -} - -size_t CutsceneSubCommandEntry_Rumble::GetRawSize() const -{ - return 0x0C; -} - -CutsceneCommand_Rumble::CutsceneCommand_Rumble(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_Rumble(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneCommand_Rumble::GetCommandMacro() const -{ - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - return StringHelper::Sprintf("CS_RUMBLE_LIST(%i)", numEntries); - } - return StringHelper::Sprintf("CS_CMD_09_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_SetTime::CutsceneSubCommandEntry_SetTime( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - hour = BitConverter::ToUInt8BE(rawData, rawDataIndex + 6); - minute = BitConverter::ToUInt8BE(rawData, rawDataIndex + 7); - unk_08 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); -} - -std::string CutsceneSubCommandEntry_SetTime::GetBodySourceCode() const -{ - return StringHelper::Sprintf("CS_TIME(%i, %i, %i, %i, %i, %i)", base, startFrame, endFrame, - hour, minute, unk_08); -} - -size_t CutsceneSubCommandEntry_SetTime::GetRawSize() const -{ - return 0x0C; -} - -CutsceneCommand_SetTime::CutsceneCommand_SetTime(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_SetTime(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneCommand_SetTime::GetCommandMacro() const -{ - return StringHelper::Sprintf("CS_TIME_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_TextBox::CutsceneSubCommandEntry_TextBox( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - type = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x6); - textId1 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x8); - textId2 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0xA); -} - -std::string CutsceneSubCommandEntry_TextBox::GetBodySourceCode() const -{ - if (type == 0xFFFF) - { - return StringHelper::Sprintf("CS_TEXT_NONE(%i, %i)", startFrame, endFrame); - } - if (type == 2) - { - return StringHelper::Sprintf("CS_TEXT_LEARN_SONG(%i, %i, %i, 0x%X)", base, startFrame, - endFrame, textId1); - } - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - switch (type) - { - case 0: - return StringHelper::Sprintf("CS_TEXT_DEFAULT(0x%X, %i, %i, 0x%X, 0x%X)", base, - startFrame, endFrame, textId1, textId2); - - case 1: - return StringHelper::Sprintf("CS_TEXT_TYPE_1(0x%X, %i, %i, 0x%X, 0x%X)", base, - startFrame, endFrame, textId1, textId2); - - case 3: - return StringHelper::Sprintf("CS_TEXT_TYPE_3(0x%X, %i, %i, 0x%X, 0x%X)", base, - startFrame, endFrame, textId1, textId2); - - case 4: - return StringHelper::Sprintf("CS_TEXT_BOSSES_REMAINS(0x%X, %i, %i, 0x%X)", base, - startFrame, endFrame, textId1); - - case 5: - return StringHelper::Sprintf("CS_TEXT_ALL_NORMAL_MASKS(0x%X, %i, %i, 0x%X)", base, - startFrame, endFrame, textId1); - } - } - - return StringHelper::Sprintf("CS_TEXT_DISPLAY_TEXTBOX(0x%X, %i, %i, %i, 0x%X, 0x%X)", base, - startFrame, endFrame, type, textId1, textId2); -} - -size_t CutsceneSubCommandEntry_TextBox::GetRawSize() const -{ - return 0x0C; -} - -CutsceneCommand_TextBox::CutsceneCommand_TextBox(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_TextBox(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneCommand_TextBox::GetCommandMacro() const -{ - return StringHelper::Sprintf("CS_TEXT_LIST(%i)", numEntries); -} - -CutsceneSubCommandEntry_ActorAction::CutsceneSubCommandEntry_ActorAction( - const std::vector& rawData, offset_t rawDataIndex) - : CutsceneSubCommandEntry(rawData, rawDataIndex) -{ - rotX = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x6); - rotY = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x8); - rotZ = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0xA); - startPosX = BitConverter::ToInt32BE(rawData, rawDataIndex + 0xC); - startPosY = BitConverter::ToInt32BE(rawData, rawDataIndex + 0x10); - startPosZ = BitConverter::ToInt32BE(rawData, rawDataIndex + 0x14); - endPosX = BitConverter::ToInt32BE(rawData, rawDataIndex + 0x18); - endPosY = BitConverter::ToInt32BE(rawData, rawDataIndex + 0x1C); - endPosZ = BitConverter::ToInt32BE(rawData, rawDataIndex + 0x20); - normalX = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x24); - normalY = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x28); - normalZ = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x2C); -} - -std::string CutsceneSubCommandEntry_ActorAction::GetBodySourceCode() const -{ - std::string result; - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - if (static_cast(commandID) == - CutsceneMMCommands::CS_CMD_SET_PLAYER_ACTION) - { - result = "CS_PLAYER_ACTION"; - } - else - { - result = "CS_ACTOR_ACTION"; - } - } - else - { - if (static_cast(commandID) == CutsceneCommands::SetPlayerAction) - { - result = "CS_PLAYER_ACTION"; - } - else - { - result = "CS_NPC_ACTION"; - } - } - - result += - StringHelper::Sprintf("(%i, %i, %i, 0x%04X, 0x%04X, 0x%04X, %i, %i, " - "%i, %i, %i, %i, %.11ef, %.11ef, %.11ef)", - base, startFrame, endFrame, rotX, rotY, rotZ, startPosX, startPosY, - startPosZ, endPosX, endPosY, endPosZ, normalX, normalY, normalZ); - return result; -} - -size_t CutsceneSubCommandEntry_ActorAction::GetRawSize() const -{ - return 0x30; -} - -CutsceneCommand_ActorAction::CutsceneCommand_ActorAction(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - entries.reserve(numEntries); - for (size_t i = 0; i < numEntries; i++) - { - auto* entry = new CutsceneSubCommandEntry_ActorAction(rawData, rawDataIndex); - entries.push_back(entry); - rawDataIndex += entry->GetRawSize(); - } -} - -std::string CutsceneCommand_ActorAction::GetCommandMacro() const -{ - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - if (static_cast(commandID) == - CutsceneMMCommands::CS_CMD_SET_PLAYER_ACTION) - { - return StringHelper::Sprintf("CS_PLAYER_ACTION_LIST(%i)", numEntries); - } - return StringHelper::Sprintf("CS_ACTOR_ACTION_LIST(0x%03X, %i)", commandID, numEntries); - } - - if (static_cast(commandID) == CutsceneCommands::SetPlayerAction) - { - return StringHelper::Sprintf("CS_PLAYER_ACTION_LIST(%i)", entries.size()); - } - return StringHelper::Sprintf("CS_NPC_ACTION_LIST(0x%03X, %i)", commandID, entries.size()); -} - -CutsceneCommand_Terminator::CutsceneCommand_Terminator(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - base = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); - startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - endFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4); - unknown = BitConverter::ToUInt16BE(rawData, rawDataIndex + 6); // endFrame duplicate -} - -std::string CutsceneCommand_Terminator::GenerateSourceCode() const -{ - std::string result; - - result += StringHelper::Sprintf("CS_TERMINATOR(%i, %i, %i),\n", base, startFrame, endFrame); - - return result; -} - -size_t CutsceneCommand_Terminator::GetCommandSize() const -{ - return 0x10; -} - -CutsceneCommandSceneTransFX::CutsceneCommandSceneTransFX(const std::vector& rawData, - offset_t rawDataIndex) - : CutsceneCommand(rawData, rawDataIndex) -{ - rawDataIndex += 4; - - base = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); - startFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - endFrame = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4); -} - -std::string CutsceneCommandSceneTransFX::GenerateSourceCode() const -{ - return StringHelper::Sprintf("CS_SCENE_TRANS_FX(%i, %i, %i),\n", base, startFrame, endFrame); -} - -size_t CutsceneCommandSceneTransFX::GetCommandSize() const -{ - return 0x10; -} diff --git a/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.h b/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.h deleted file mode 100644 index c46273587..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/Cutscene_Commands.h +++ /dev/null @@ -1,267 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "Declaration.h" - -enum class CutsceneCommands -{ - SetCameraPos = 0x0001, - SetCameraFocus = 0x0002, - Misc = 0x0003, - SetLighting = 0x0004, - SetCameraPosLink = 0x0005, - SetCameraFocusLink = 0x0006, - Cmd07 = 0x0007, - Cmd08 = 0x0008, - Cmd09 = 0x0009, // Rumble - Textbox = 0x0013, - SetPlayerAction = 0x000A, - SetActorAction1 = 0x000F, - SetActorAction2 = 0x000E, - SetActorAction3 = 0x0019, - SetActorAction4 = 0x001D, - SetActorAction5 = 0x001E, - SetActorAction6 = 0x002C, - SetActorAction7 = 0x001F, - SetActorAction8 = 0x0031, - SetActorAction9 = 0x003E, - SetActorAction10 = 0x008F, - SetSceneTransFX = 0x002D, - PlayBGM = 0x0056, - StopBGM = 0x0057, - FadeBGM = 0x007C, - SetTime = 0x008C, - Terminator = 0x03E8, -}; - -typedef struct CsCommandListDescriptor -{ - const char* cmdMacro; - const char* args; -} CsCommandListDescriptor; - -class CutsceneSubCommandEntry -{ -public: - uint16_t base; - uint16_t startFrame; - uint16_t endFrame; - uint16_t pad; - - uint32_t commandID; - - CutsceneSubCommandEntry(const std::vector& rawData, offset_t rawDataIndex); - virtual ~CutsceneSubCommandEntry() = default; - - virtual std::string GetBodySourceCode() const; - - virtual size_t GetRawSize() const; -}; - -class CutsceneCommand -{ -public: - uint32_t commandID; - uint32_t commandIndex; - - uint32_t numEntries; - std::vector entries; - - CutsceneCommand(const std::vector& rawData, offset_t rawDataIndex); - virtual ~CutsceneCommand(); - - virtual std::string GetCommandMacro() const; - virtual std::string GenerateSourceCode() const; - virtual size_t GetCommandSize() const; - - virtual void SetCommandID(uint32_t nCommandID); -}; - -class CutsceneSubCommandEntry_GenericCmd : public CutsceneSubCommandEntry -{ -public: - CutsceneCommands commandId; - - uint32_t word0 = 0; - uint32_t word1 = 0; - - uint32_t unused1 = 0; - uint32_t unused2 = 0; - uint32_t unused3 = 0; - uint32_t unused4 = 0; - uint32_t unused5 = 0; - uint32_t unused6 = 0; - uint32_t unused7 = 0; - uint32_t unused8 = 0; - uint32_t unused9 = 0; - uint32_t unused10 = 0; - - CutsceneSubCommandEntry_GenericCmd(const std::vector& rawData, offset_t rawDataIndex, - CutsceneCommands cmdId); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommand_GenericCmd : public CutsceneCommand -{ -public: - CutsceneCommand_GenericCmd(const std::vector& rawData, offset_t rawDataIndex, - CutsceneCommands cmdId); - - std::string GetCommandMacro() const override; -}; - -class CutsceneCameraPoint : public CutsceneSubCommandEntry -{ -public: - int8_t continueFlag; - int8_t cameraRoll; - int16_t nextPointFrame; - float viewAngle; - int16_t posX, posY, posZ; - int16_t unused; - - CutsceneCameraPoint(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommandSetCameraPos : public CutsceneCommand -{ -public: - uint16_t base; - uint16_t startFrame; - uint16_t endFrame; - uint16_t unused; - - CutsceneCommandSetCameraPos(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; - - size_t GetCommandSize() const override; -}; - -class CutsceneCommandSceneTransFX : public CutsceneCommand -{ -public: - uint16_t base; - uint16_t startFrame; - uint16_t endFrame; - - CutsceneCommandSceneTransFX(const std::vector& rawData, offset_t rawDataIndex); - - std::string GenerateSourceCode() const override; - size_t GetCommandSize() const override; -}; - -class CutsceneSubCommandEntry_Rumble : public CutsceneSubCommandEntry -{ -public: - uint8_t unk_06; - uint8_t unk_07; - uint8_t unk_08; - uint8_t unk_09; - uint8_t unk_0A; - uint8_t unk_0B; - - CutsceneSubCommandEntry_Rumble(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommand_Rumble : public CutsceneCommand -{ -public: - CutsceneCommand_Rumble(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_SetTime : public CutsceneSubCommandEntry -{ -public: - uint8_t hour; - uint8_t minute; - uint32_t unk_08; - - CutsceneSubCommandEntry_SetTime(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommand_SetTime : public CutsceneCommand -{ -public: - CutsceneCommand_SetTime(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_TextBox : public CutsceneSubCommandEntry -{ -public: - uint16_t type; - uint16_t textId1; - uint16_t textId2; - - CutsceneSubCommandEntry_TextBox(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommand_TextBox : public CutsceneCommand -{ -public: - CutsceneCommand_TextBox(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneSubCommandEntry_ActorAction : public CutsceneSubCommandEntry -{ -public: - uint16_t rotX, rotY, rotZ; - int32_t startPosX, startPosY, startPosZ; - int32_t endPosX, endPosY, endPosZ; - float normalX, normalY, normalZ; - - CutsceneSubCommandEntry_ActorAction(const std::vector& rawData, offset_t rawDataIndex); - std::string GetBodySourceCode() const override; - - size_t GetRawSize() const override; -}; - -class CutsceneCommand_ActorAction : public CutsceneCommand -{ -public: - CutsceneCommand_ActorAction(const std::vector& rawData, offset_t rawDataIndex); - - std::string GetCommandMacro() const override; -}; - -class CutsceneCommand_Terminator : public CutsceneCommand -{ -public: - uint16_t base; - uint16_t startFrame; - uint16_t endFrame; - uint16_t unknown; - - CutsceneCommand_Terminator(const std::vector& rawData, offset_t rawDataIndex); - - std::string GenerateSourceCode() const override; - size_t GetCommandSize() const override; -}; diff --git a/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.cpp b/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.cpp deleted file mode 100644 index 8a0e49cf3..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.cpp +++ /dev/null @@ -1,352 +0,0 @@ -#include "SkinLimbStructs.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZDisplayList.h" -#include "ZFile.h" - -/* Struct_800A57C0 */ - -Struct_800A57C0::Struct_800A57C0(ZFile* nParent) : ZResource(nParent) -{ -} - -void Struct_800A57C0::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - unk_0 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x00); - unk_2 = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x02); - unk_4 = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x04); - unk_6 = BitConverter::ToInt8BE(rawData, rawDataIndex + 0x06); - unk_7 = BitConverter::ToInt8BE(rawData, rawDataIndex + 0x07); - unk_8 = BitConverter::ToInt8BE(rawData, rawDataIndex + 0x08); - unk_9 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x09); -} - -std::string Struct_800A57C0::GetBodySourceCode() const -{ - return StringHelper::Sprintf("0x%02X, %i, %i, %i, %i, %i, 0x%02X", unk_0, unk_2, unk_4, unk_6, - unk_7, unk_8, unk_9); -} - -std::string Struct_800A57C0::GetSourceTypeName() const -{ - return "Struct_800A57C0"; -} - -ZResourceType Struct_800A57C0::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t Struct_800A57C0::GetRawDataSize() const -{ - return 0x0A; -} - -/* Struct_800A598C_2 */ - -Struct_800A598C_2::Struct_800A598C_2(ZFile* nParent) : ZResource(nParent) -{ -} - -void Struct_800A598C_2::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - unk_0 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x00); - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x02); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x04); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x06); - unk_8 = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x08); -} - -std::string Struct_800A598C_2::GetBodySourceCode() const -{ - return StringHelper::Sprintf("0x%02X, %i, %i, %i, 0x%02X", unk_0, x, y, z, unk_8); -} - -std::string Struct_800A598C_2::GetSourceTypeName() const -{ - return "Struct_800A598C_2"; -} - -ZResourceType Struct_800A598C_2::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t Struct_800A598C_2::GetRawDataSize() const -{ - return 0x0A; -} - -/* Struct_800A598C */ - -Struct_800A598C::Struct_800A598C(ZFile* nParent) : ZResource(nParent) -{ -} - -void Struct_800A598C::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - unk_0 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x00); - unk_2 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x02); - unk_4 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x04); - unk_8 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x08); - unk_C = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x0C); - - if (unk_8 != 0 && GETSEGNUM(unk_8) == parent->segment) - { - uint32_t unk_8_Offset = Seg2Filespace(unk_8, parent->baseAddress); - - unk_8_arr.reserve(unk_0); - for (size_t i = 0; i < unk_0; i++) - { - Struct_800A57C0 unk8_data(parent); - unk8_data.ExtractFromFile(unk_8_Offset); - unk_8_arr.push_back(unk8_data); - - unk_8_Offset += unk8_data.GetRawDataSize(); - } - } - - if (unk_C != 0 && GETSEGNUM(unk_8) == parent->segment) - { - uint32_t unk_C_Offset = Seg2Filespace(unk_C, parent->baseAddress); - - unk_C_arr.reserve(unk_2); - for (size_t i = 0; i < unk_2; i++) - { - Struct_800A598C_2 unkC_data(parent); - unkC_data.ExtractFromFile(unk_C_Offset); - unk_C_arr.push_back(unkC_data); - - unk_C_Offset += unkC_data.GetRawDataSize(); - } - } -} - -void Struct_800A598C::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = prefix; - if (name != "") - varPrefix = name; - - if (unk_8 != 0 && GETSEGNUM(unk_8) == parent->segment) - { - const auto& res = unk_8_arr.at(0); - std::string unk_8_Str = res.GetDefaultName(varPrefix); - - size_t arrayItemCnt = unk_8_arr.size(); - std::string entryStr = ""; - - for (size_t i = 0; i < arrayItemCnt; i++) - { - auto& child = unk_8_arr[i]; - child.DeclareReferences(varPrefix); - entryStr += StringHelper::Sprintf("\t{ %s },", child.GetBodySourceCode().c_str()); - - if (i < arrayItemCnt - 1) - entryStr += "\n"; - } - - uint32_t unk_8_Offset = Seg2Filespace(unk_8, parent->baseAddress); - Declaration* decl = parent->GetDeclaration(unk_8_Offset); - if (decl == nullptr) - { - parent->AddDeclarationArray(unk_8_Offset, res.GetDeclarationAlignment(), - arrayItemCnt * res.GetRawDataSize(), - res.GetSourceTypeName(), unk_8_Str, arrayItemCnt, entryStr); - } - else - decl->text = entryStr; - } - - if (unk_C != 0 && GETSEGNUM(unk_C) == parent->segment) - { - const auto& res = unk_C_arr.at(0); - std::string unk_C_Str = res.GetDefaultName(varPrefix); - - size_t arrayItemCnt = unk_C_arr.size(); - std::string entryStr = ""; - - for (size_t i = 0; i < arrayItemCnt; i++) - { - auto& child = unk_C_arr[i]; - child.DeclareReferences(varPrefix); - entryStr += StringHelper::Sprintf("\t{ %s },", child.GetBodySourceCode().c_str()); - - if (i < arrayItemCnt - 1) - entryStr += "\n"; - } - - uint32_t unk_C_Offset = Seg2Filespace(unk_C, parent->baseAddress); - Declaration* decl = parent->GetDeclaration(unk_C_Offset); - if (decl == nullptr) - { - parent->AddDeclarationArray(unk_C_Offset, res.GetDeclarationAlignment(), - arrayItemCnt * res.GetRawDataSize(), - res.GetSourceTypeName(), unk_C_Str, arrayItemCnt, entryStr); - } - else - decl->text = entryStr; - } -} - -std::string Struct_800A598C::GetBodySourceCode() const -{ - std::string unk_8_Str; - std::string unk_C_Str; - Globals::Instance->GetSegmentedPtrName(unk_8, parent, "Struct_800A57C0", unk_8_Str, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(unk_C, parent, "Struct_800A598C_2", unk_C_Str, - parent->workerID); - - std::string entryStr = StringHelper::Sprintf("\n\t\tARRAY_COUNTU(%s), ARRAY_COUNTU(%s),\n", - unk_8_Str.c_str(), unk_C_Str.c_str()); - entryStr += - StringHelper::Sprintf("\t\t%i, %s, %s\n\t", unk_4, unk_8_Str.c_str(), unk_C_Str.c_str()); - - return entryStr; -} - -std::string Struct_800A598C::GetSourceTypeName() const -{ - return "Struct_800A598C"; -} - -ZResourceType Struct_800A598C::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t Struct_800A598C::GetRawDataSize() const -{ - return 0x10; -} - -/* Struct_800A5E28 */ - -Struct_800A5E28::Struct_800A5E28(ZFile* nParent) : ZResource(nParent) -{ -} - -void Struct_800A5E28::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - unk_0 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x00); - unk_2 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x02); - unk_4 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x04); - unk_8 = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x08); - - if (unk_4 != 0 && GETSEGNUM(unk_4) == parent->segment) - { - uint32_t unk_4_Offset = Seg2Filespace(unk_4, parent->baseAddress); - - unk_4_arr.reserve(unk_2); - for (size_t i = 0; i < unk_2; i++) - { - Struct_800A598C unk_4_data(parent); - unk_4_data.ExtractFromFile(unk_4_Offset); - unk_4_arr.push_back(unk_4_data); - - unk_4_Offset += unk_4_data.GetRawDataSize(); - } - } -} - -void Struct_800A5E28::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = prefix; - if (name != "") - varPrefix = name; - - ZResource::DeclareReferences(varPrefix); - - if (unk_4 != SEGMENTED_NULL && GETSEGNUM(unk_4) == parent->segment) - { - const auto& res = unk_4_arr.at(0); - std::string unk_4_Str = res.GetDefaultName(varPrefix); - - size_t arrayItemCnt = unk_4_arr.size(); - std::string entryStr = ""; - - for (size_t i = 0; i < arrayItemCnt; i++) - { - auto& child = unk_4_arr[i]; - child.DeclareReferences(varPrefix); - entryStr += StringHelper::Sprintf("\t{ %s },", child.GetBodySourceCode().c_str()); - - if (i < arrayItemCnt - 1) - entryStr += "\n"; - } - - uint32_t unk_4_Offset = Seg2Filespace(unk_4, parent->baseAddress); - Declaration* decl = parent->GetDeclaration(unk_4_Offset); - if (decl == nullptr) - { - parent->AddDeclarationArray(unk_4_Offset, res.GetDeclarationAlignment(), - arrayItemCnt * res.GetRawDataSize(), - res.GetSourceTypeName(), unk_4_Str, arrayItemCnt, entryStr); - } - else - decl->text = entryStr; - } - - if (unk_8 != SEGMENTED_NULL && GETSEGNUM(unk_8) == parent->segment) - { - uint32_t unk_8_Offset = Seg2Filespace(unk_8, parent->baseAddress); - - int32_t dlistLength = ZDisplayList::GetDListLength( - parent->GetRawData(), unk_8_Offset, - Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX); - unk_8_dlist = new ZDisplayList(parent); - unk_8_dlist->ExtractFromBinary(unk_8_Offset, dlistLength); - - std::string dListStr = - StringHelper::Sprintf("%sSkinLimbDL_%06X", varPrefix.c_str(), unk_8_Offset); - unk_8_dlist->SetName(dListStr); - unk_8_dlist->DeclareVar(varPrefix, ""); - unk_8_dlist->DeclareReferences(varPrefix); - parent->AddResource(unk_8_dlist); - } -} - -std::string Struct_800A5E28::GetBodySourceCode() const -{ - std::string unk_4_Str; - std::string unk_8_Str; - Globals::Instance->GetSegmentedPtrName(unk_4, parent, "Struct_800A598C", unk_4_Str, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(unk_8, parent, "Gfx", unk_8_Str, parent->workerID); - - std::string entryStr = "\n"; - entryStr += StringHelper::Sprintf("\t%i, ARRAY_COUNTU(%s),\n", unk_0, unk_4_Str.c_str()); - entryStr += StringHelper::Sprintf("\t%s, %s\n", unk_4_Str.c_str(), unk_8_Str.c_str()); - - return entryStr; -} - -std::string Struct_800A5E28::GetSourceTypeName() const -{ - return "Struct_800A5E28"; -} - -ZResourceType Struct_800A5E28::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t Struct_800A5E28::GetRawDataSize() const -{ - return 0x0C; -} diff --git a/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.h b/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.h deleted file mode 100644 index ce842aee3..000000000 --- a/ZAPDTR/ZAPD/OtherStructs/SkinLimbStructs.h +++ /dev/null @@ -1,114 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "ZResource.h" -#include "ZDisplayList.h" - -// TODO: check if more types exists -enum class ZLimbSkinType -{ - SkinType_0, // Segment = 0 - SkinType_4 = 4, // Segment = segmented address // Struct_800A5E28 - SkinType_5 = 5, // Segment = 0 - SkinType_DList = 11, // Segment = DList address -}; - -class Struct_800A57C0 : public ZResource -{ -public: - Struct_800A57C0(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -public: - uint16_t unk_0; - int16_t unk_2; - int16_t unk_4; - int8_t unk_6; - int8_t unk_7; - int8_t unk_8; - uint8_t unk_9; -}; - -class Struct_800A598C_2 : public ZResource -{ -public: - Struct_800A598C_2(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -public: - uint8_t unk_0; - int16_t x; - int16_t y; - int16_t z; - uint8_t unk_8; -}; - -class Struct_800A598C : public ZResource -{ -public: - Struct_800A598C(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -public: - uint16_t unk_0; // Length of unk_8 - uint16_t unk_2; // Length of unk_C - uint16_t unk_4; // 0 or 1 // Used as an index for unk_C - segptr_t unk_8; // Struct_800A57C0* - segptr_t unk_C; // Struct_800A598C_2* - - std::vector unk_8_arr; - std::vector unk_C_arr; -}; - -class Struct_800A5E28 : public ZResource -{ -public: - Struct_800A5E28(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -public: - uint16_t unk_0; // Vtx count - uint16_t unk_2; // Length of unk_4 - segptr_t unk_4; // Struct_800A598C* - segptr_t unk_8; // Gfx* - - std::vector unk_4_arr; - ZDisplayList* unk_8_dlist = nullptr; -}; diff --git a/ZAPDTR/ZAPD/OutputFormatter.cpp b/ZAPDTR/ZAPD/OutputFormatter.cpp deleted file mode 100644 index 362ef98fc..000000000 --- a/ZAPDTR/ZAPD/OutputFormatter.cpp +++ /dev/null @@ -1,123 +0,0 @@ -#include "OutputFormatter.h" -#include - -void OutputFormatter::Flush() -{ - //if (!Globals::Instance->otrMode) // OTRTODO: MULTITHREADING - { - if (col > lineLimit && !Globals::Instance->otrMode) - { - str.append(1, '\n'); - str.append(currentIndent, ' '); - - uint32_t newCol = currentIndent + (wordP - word); - - for (uint32_t i = 0; i < wordNests; i++) - nestIndent[nest - i] -= col - newCol; - - col = newCol; - } - else - { - str.append(space, spaceP - space); - } - spaceP = space; - - str.append(word, wordP - word); - wordP = word; - wordNests = 0; - } -} - -int OutputFormatter::Write(const char* buf, int count) -{ - // OTRTODO - //if (!Globals::Instance->singleThreaded) - //return 0; - - for (int i = 0; i < count; i++) - { - char c = buf[i]; - - if (c == ' ' || c == '\t' || c == '\n') - { - if (wordP - word != 0) - { - Flush(); - } - - if (c == '\n') - { - col = 0; - *spaceP++ = c; - } - else if (c == '\t') - { - int n = tabSize - (col % tabSize); - col += n; - for (int j = 0; j < n; j++) - *spaceP++ = ' '; - } - else - { - col++; - *spaceP++ = c; - } - - currentIndent = nestIndent[nest]; - } - else - { - col++; - - if (c == '(') - { - nest++; - nestIndent[nest] = col; - wordNests++; - } - else if (c == ')') - { - if (nest > 0) - nest--; - if (wordNests > 0) - wordNests--; - } - - *wordP++ = c; - } - } - - return count; -} - -int OutputFormatter::Write(const std::string& buf) -{ - return Write(buf.data(), buf.size()); -} - -thread_local OutputFormatter* OutputFormatter::Instance; - -int OutputFormatter::WriteStatic(const char* buf, int count) -{ - return Instance->Write(buf, count); -} - -int (*OutputFormatter::StaticWriter())(const char* buf, int count) -{ - Instance = this; - return &WriteStatic; -} - -OutputFormatter::OutputFormatter(uint32_t tabSize, uint32_t indentation, uint32_t lineLimit) - : tabSize{tabSize}, lineLimit{lineLimit}, col{0}, nest{0}, nestIndent{indentation}, - currentIndent{indentation}, wordNests(0), wordP{word}, spaceP{space} -{ -} - -std::string OutputFormatter::GetOutput() -{ - Flush(); - - return std::move(str); -} diff --git a/ZAPDTR/ZAPD/OutputFormatter.h b/ZAPDTR/ZAPD/OutputFormatter.h deleted file mode 100644 index 391f41027..000000000 --- a/ZAPDTR/ZAPD/OutputFormatter.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -class OutputFormatter -{ -private: - const uint32_t tabSize; - const uint32_t lineLimit; - - uint32_t col; - uint32_t nest; - uint32_t nestIndent[8]; - uint32_t currentIndent; - uint32_t wordNests; - - char word[128]; - char space[128]; - char* wordP; - char* spaceP; - - std::string str; - - void Flush(); - - static thread_local OutputFormatter* Instance; - static int WriteStatic(const char* buf, int count); - -public: - OutputFormatter(uint32_t tabSize = 4, uint32_t indentation = 4, uint32_t lineLimit = 120); - - int (*StaticWriter())(const char* buf, int count); // Must be `int` due to libgfxd - - int Write(const char* buf, int count); - int Write(const std::string& buf); - - std::string GetOutput(); -}; diff --git a/ZAPDTR/ZAPD/Overlays/ZOverlay.cpp b/ZAPDTR/ZAPD/Overlays/ZOverlay.cpp deleted file mode 100644 index 168ed2374..000000000 --- a/ZAPDTR/ZAPD/Overlays/ZOverlay.cpp +++ /dev/null @@ -1,354 +0,0 @@ -#if 0 -#include "ZOverlay.h" - -#include -#include -#include "Globals.h" -#include "Utils/Directory.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" - -using namespace ELFIO; - -const char* RelocationEntry::GetSectionName() const -{ - switch (sectionType) - { - case SectionType::Text: - return ".text"; - case SectionType::Data: - return ".data"; - case SectionType::RoData: - return ".rodata"; - case SectionType::Bss: - return ".bss"; - case SectionType::ERROR: - return ".ERROR"; - } - assert(!"Oh no :c"); -} - -const char* RelocationEntry::GetRelocTypeName() const -{ - switch (relocationType) - { - case RelocationType::R_MIPS_32: - return "R_MIPS_32"; - case RelocationType::R_MIPS_26: - return "R_MIPS_26"; - case RelocationType::R_MIPS_HI16: - return "R_MIPS_HI16"; - case RelocationType::R_MIPS_LO16: - return "R_MIPS_LO16"; - } - assert(!"Oh no :c"); -} - -ZOverlay::ZOverlay() -{ - name = ""; - entries = std::vector(); -} - -ZOverlay::ZOverlay(const std::string& nName) : ZOverlay() -{ - name = nName; -} - -ZOverlay::~ZOverlay() -{ - for (auto entry : entries) - if (entry) - delete entry; - entries.clear(); -} - -static const std::unordered_set sRelSections = { - ".rel.text", - ".rel.data", - ".rel.rodata", -}; -static const std::unordered_set sSections = { - ".text", ".data", ".symtab", ".rodata", ".rodata.str1.4", ".rodata.cst4", ".rodata.cst8", -}; - -ZOverlay* ZOverlay::FromBuild(fs::path buildPath, fs::path cfgFolderPath) -{ - std::string cfgText = DiskFile::ReadAllText(cfgFolderPath / "overlay.cfg"); - std::vector cfgLines = StringHelper::Split(cfgText, "\n"); - - ZOverlay* ovl = new ZOverlay(StringHelper::Strip(cfgLines[0], "\r")); - ovl->cfgLines = cfgLines; - - int32_t sectionOffs[5] = {0}; - std::vector textRelocs; - std::vector dataRelocs; - std::vector rodataRelocs; - - // get the elf files - std::vector readers; - for (size_t i = 1; i < cfgLines.size(); i++) - { - std::string elfPath = - (buildPath / (cfgLines[i].substr(0, cfgLines[i].size() - 2) + ".o")).string(); - elfio* reader = new elfio(); - - if (!reader->load(elfPath)) - { - // not all files were compiled - for (auto r : readers) - delete r; - readers.clear(); - - delete ovl; - return nullptr; - } - - readers.push_back(reader); - } - - for (size_t curReaderId = 0; curReaderId < readers.size(); curReaderId++) - { - auto& curReader = readers[curReaderId]; - - Elf_Half sec_num = curReader->sections.size(); - for (int32_t i = 0; i < sec_num; i++) - { - section* pSec = curReader->sections[i]; - - if (pSec->get_type() != SHT_REL || - sRelSections.find(pSec->get_name()) == sRelSections.end()) - { - continue; - } - - symbol_section_accessor currentSymbols(*curReader, - curReader->sections[(Elf_Half)pSec->get_link()]); - - SectionType sectionType = GetSectionTypeFromStr(pSec->get_name()); - - if (sectionType == SectionType::ERROR) - { - HANDLE_WARNING(WarningType::Always, "one of the section types returned ERROR", ""); - } - - relocation_section_accessor relocs(*curReader, pSec); - for (Elf_Xword j = 0; j < relocs.get_entries_num(); j++) - { - Elf64_Addr offset = 0; - Elf_Word symbol = 0; - Elf_Word type = 0; - { - Elf_Sxword addend = 0; - relocs.get_entry(j, offset, symbol, type, addend); - } - - std::string curSymName; - Elf_Half curSymShndx = SHN_UNDEF; - { - Elf64_Addr value; - Elf_Xword size; - unsigned char bind; - unsigned char type; - unsigned char other; - currentSymbols.get_symbol(symbol, curSymName, value, size, bind, type, - curSymShndx, other); - } - - // check symbols outside the elf but within the overlay - if (curSymShndx == SHN_UNDEF) - { - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf("Symbol '%s' doesn't exist in current .o file (%s). Searching...\n", - curSymName.c_str(), cfgLines[curReaderId + 1].c_str()); - } - - for (size_t readerId = 0; readerId < readers.size(); readerId++) - { - auto& reader = readers[readerId]; - - if (curSymShndx != SHN_UNDEF) - break; - - if (reader == curReader) - continue; - - auto sectionData = reader->sections[(Elf_Half)pSec->get_link()]; - curSymShndx = - ovl->FindSymbolInSection(curSymName, sectionData, *reader, readerId); - if (curSymShndx != SHN_UNDEF) - break; - - if (Globals::Instance->gccCompat) - { - // Symbol wasn't found, try checking every section - Elf_Half sec_num = reader->sections.size(); - for (int32_t otherSectionIdx = 0; otherSectionIdx < sec_num; - otherSectionIdx++) - { - if (curSymShndx != SHN_UNDEF) - { - break; - } - - auto sectionDataIter = reader->sections[otherSectionIdx]; - - curSymShndx = ovl->FindSymbolInSection(curSymName, sectionDataIter, - *reader, readerId); - } - } - } - } - - if (curSymShndx != SHN_UNDEF) - { - RelocationType typeConverted = (RelocationType)type; - offset += sectionOffs[static_cast(sectionType)]; - - RelocationEntry* reloc = - new RelocationEntry(sectionType, typeConverted, offset); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf(".word 0x%08X # %s %s 0x%04X\n", reloc->CalcRelocationWord(), - reloc->GetSectionName(), reloc->GetRelocTypeName(), reloc->offset); - } - - // this is to keep the correct reloc entry order - if (sectionType == SectionType::Text) - textRelocs.push_back(reloc); - if (sectionType == SectionType::Data) - dataRelocs.push_back(reloc); - if (sectionType == SectionType::RoData) - rodataRelocs.push_back(reloc); - } - } - } - - // increase section offsets - for (int32_t i = 0; i < sec_num; i++) - { - section* pSec = curReader->sections[i]; - if (pSec->get_type() == SHT_PROGBITS && - sSections.find(pSec->get_name()) != sSections.end()) - { - SectionType sectionType = GetSectionTypeFromStr(pSec->get_name()); - sectionOffs[static_cast(sectionType)] += pSec->get_size(); - } - } - } - - ovl->entries.reserve(textRelocs.size() + dataRelocs.size() + rodataRelocs.size()); - ovl->entries.insert(ovl->entries.end(), textRelocs.begin(), textRelocs.end()); - ovl->entries.insert(ovl->entries.end(), dataRelocs.begin(), dataRelocs.end()); - ovl->entries.insert(ovl->entries.end(), rodataRelocs.begin(), rodataRelocs.end()); - - for (auto r : readers) - delete r; - readers.clear(); - - return ovl; -} - -std::string ZOverlay::GetSourceOutputCode([[maybe_unused]] const std::string& prefix) -{ - std::string output; - - output += ".section .ovl\n"; - - output += StringHelper::Sprintf("# %sOverlayInfo\n", name.c_str()); - output += StringHelper::Sprintf(".word _%sSegmentTextSize\n", name.c_str()); - output += StringHelper::Sprintf(".word _%sSegmentDataSize\n", name.c_str()); - output += StringHelper::Sprintf(".word _%sSegmentRoDataSize\n", name.c_str()); - output += StringHelper::Sprintf(".word _%sSegmentBssSize\n", name.c_str()); - output += "\n"; - - output += StringHelper::Sprintf(".word %i # reloc_count\n", entries.size()); - - for (size_t i = 0; i < entries.size(); i++) - { - RelocationEntry* reloc = entries[i]; - output += StringHelper::Sprintf(".word 0x%08X # %s %s 0x%04X\n", - reloc->CalcRelocationWord(), reloc->GetSectionName(), - reloc->GetRelocTypeName(), reloc->offset); - } - - size_t offset = (entries.size() * 4) + 20; - - while (offset % 16 != 12) - { - output += ".word 0\n"; - offset += 4; - } - - output += "\n"; - output += - StringHelper::Sprintf(".word 0x%08X # %sOverlayInfoOffset\n", offset + 4, name.c_str()); - return output; -} - -SectionType ZOverlay::GetSectionTypeFromStr(const std::string& sectionName) -{ - if (sectionName == ".rel.text" || sectionName == ".text") - return SectionType::Text; - else if (sectionName == ".rel.data" || sectionName == ".data") - return SectionType::Data; - else if (sectionName == ".rel.rodata" || sectionName == ".rodata" || - sectionName == ".rodata.str1.4" || sectionName == ".rodata.cst4") - return SectionType::RoData; - else if (sectionName == ".rel.bss" || sectionName == ".bss") - return SectionType::Bss; - - return SectionType::ERROR; -} - -ELFIO::Elf_Half ZOverlay::FindSymbolInSection(const std::string& curSymName, - ELFIO::section* sectionData, ELFIO::elfio& reader, - size_t readerId) -{ - if (sectionData == nullptr) - return SHN_UNDEF; - - auto sectionDataName = sectionData->get_name(); - if (sSections.find(sectionDataName) == sSections.end()) - return SHN_UNDEF; - -#ifdef DEVELOPMENT - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf("\t File '%s' section: %s \n", cfgLines[readerId + 1].c_str(), - sectionDataName.c_str()); - } -#endif - - symbol_section_accessor symbols(reader, sectionData); - - Elf_Xword symbolNum = symbols.get_symbols_num(); - for (Elf_Xword symIdx = 0; symIdx < symbolNum; symIdx++) - { - Elf_Half shndx = SHN_UNDEF; - Elf64_Addr value; - std::string name; - Elf_Xword size; - unsigned char bind; - unsigned char type; - unsigned char other; - - symbols.get_symbol(symIdx, name, value, size, bind, type, shndx, other); - - if (name == curSymName) - { - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf("\t Symbol '%s' found in '%s' '%s' \n", curSymName.c_str(), - cfgLines[readerId + 1].c_str(), sectionDataName.c_str()); - } - return shndx; - } - } - return SHN_UNDEF; -} -#endif \ No newline at end of file diff --git a/ZAPDTR/ZAPD/Overlays/ZOverlay.h b/ZAPDTR/ZAPD/Overlays/ZOverlay.h deleted file mode 100644 index c1fadddca..000000000 --- a/ZAPDTR/ZAPD/Overlays/ZOverlay.h +++ /dev/null @@ -1,78 +0,0 @@ -#pragma once - -#if 0 - -#include "Utils/Directory.h" -#include "ZResource.h" -#include "elfio/elfio.hpp" -#include "tinyxml2.h" - -enum class SectionType -{ - Text = 1, - Data = 2, - RoData = 3, - Bss = 4, - ERROR = 255 -}; - -enum class RelocationType -{ - R_MIPS_32 = 2, - R_MIPS_26 = 4, - R_MIPS_HI16 = 5, - R_MIPS_LO16 = 6, -}; - -class RelocationEntry -{ -public: - SectionType sectionType; - RelocationType relocationType; - int32_t offset; - - RelocationEntry(SectionType nSecType, RelocationType nRelType, int32_t nOffset) - { - sectionType = nSecType; - relocationType = nRelType; - offset = nOffset; - } - - uint32_t CalcRelocationWord() - { - uint32_t relocationWord = 0; - - relocationWord |= static_cast(sectionType) << 30; - relocationWord |= static_cast(relocationType) << 24; - relocationWord |= offset; - - return relocationWord; - } - - const char* GetSectionName() const; - const char* GetRelocTypeName() const; -}; - -class ZOverlay -{ -public: - std::string name; - - ZOverlay(const std::string& nName); - ~ZOverlay(); - static ZOverlay* FromBuild(fs::path buildPath, fs::path cfgFolderPath); - std::string GetSourceOutputCode(const std::string& prefix); - -private: - std::vector entries; - std::vector cfgLines; - - ZOverlay(); - - static SectionType GetSectionTypeFromStr(const std::string& sectionName); - // static std::string GetOverlayNameFromElf(ELFIO::elfio& reader); - - ELFIO::Elf_Half FindSymbolInSection(const std::string& curSymName, ELFIO::section* sectionData, - ELFIO::elfio& reader, size_t readerId); -}; -#endif \ No newline at end of file diff --git a/ZAPDTR/ZAPD/WarningHandler.cpp b/ZAPDTR/ZAPD/WarningHandler.cpp deleted file mode 100644 index 163b028b5..000000000 --- a/ZAPDTR/ZAPD/WarningHandler.cpp +++ /dev/null @@ -1,451 +0,0 @@ -/** - * ZAPD Warning- and Error-handling system - * ======================================= - * - * This provides a common standard way to write ZAPD warnings/errors, which should be used for all - * such. It will pretty-print them in a uniform way, with styles defined in the header. - * - * Warnings/errors should be constructed using the macros given in the header; there are now plenty - * of examples in the codebase of how to do this. Their purposes are noted above each category in - * the header. Each warning has a type, one of the ones in warningStringToInitMap, or - * WarningType::Always, which is used for warnings that cannot be disabled and do not display a - * type. - * - * Currently there are three levels of alert a warning can have: - * - Off (does not display anything) - * - Warn (print a warning but continue processing) - * - Err (behave like an error, i.e. print and throw an exception to crash ZAPD when occurs) - * - * Flag use: - * - -Wfoo enables warnings of type foo - * - -Wno-foo disables warnings of type foo - * - -Werror=foo escalates foo to behave like an error - * - -Weverything enables all warnings - * - -Werror escalates all enabled warnings to errors - * - * Errors do not have types, and will always throw an exception; they cannot be disabled. - * - * Format - * === - * Each printed warning/error contains the same three sections: - * - Preamble: automatically generated; the content varies depending on category. It will print the - * file and function that the warning is from, and information about the files being processed - * or extracted. - * - Header: begins with 'warning: ' or 'error:', should contain essential information about the - * warning/error, ends with the warning type if applicable. Printed with emphasis to make it - * stand out. Does not start with a capital letter or end with a '.' - * - Body (optional): indented, should contain further diagnostic information useful for identifying - * and fixing the warning/error. Can be a sentence with captialisation and '.' on the end. - * - * Please think of what the end user will find most useful when writing the header and body, and try - * to keep it brief without sacrificing important information! Also remember that if the user is - * only looking at stderr, they will normally have no other context. - * - * Warning vs error - * === - * The principle that we have operated on so far is - * - issue a warning if ZAPD will still be able to produce a valid, compilable C file that will - * match - * - if this cannot happen, use an error. - * but at the end of the day, it is up to the programmer's discretion what it should be possible to - * disable. - * - * Documentation - * === - * Remember that all warnings also need to be documented in the README.md. The help is generated - * automatically. - */ -#include "WarningHandler.h" - -#include -#include "Globals.h" -#include "Utils/StringHelper.h" - -typedef struct -{ - WarningType type; - WarningLevel defaultLevel; - std::string description; -} WarningInfoInit; - -typedef struct -{ - WarningLevel level; - std::string name; - std::string description; -} WarningInfo; - -/** - * Master list of all default warning types and features - * - * To add a warning type, fill in a new row of this map. Think carefully about what its default - * level should be, and try and make the description both brief and informative: it is used in the - * help message, so again, think about what the end user needs to know. - */ -// clang-format off -static const std::unordered_map warningStringToInitMap = { - {"deprecated", {WarningType::Deprecated, -#ifdef DEPRECATION_ON - WarningLevel::Warn, -#else - WarningLevel::Off, -#endif - "Deprecated features"}}, - {"unaccounted", {WarningType::Unaccounted, WarningLevel::Off, "Large blocks of unaccounted"}}, - {"missing-offsets", {WarningType::MissingOffsets, WarningLevel::Warn, "Offset attribute missing in XML tag"}}, - {"intersection", {WarningType::Intersection, WarningLevel::Warn, "Two assets intersect"}}, - {"missing-attribute", {WarningType::MissingAttribute, WarningLevel::Warn, "Required attribute missing in XML tag"}}, - {"invalid-attribute-value", {WarningType::InvalidAttributeValue, WarningLevel::Err, "Attribute declared in XML is wrong"}}, - {"unknown-attribute", {WarningType::UnknownAttribute, WarningLevel::Warn, "Unknown attribute in XML entry tag"}}, - {"invalid-xml", {WarningType::InvalidXML, WarningLevel::Err, "XML has syntax errors"}}, - {"invalid-jpeg", {WarningType::InvalidJPEG, WarningLevel::Err, "JPEG file does not conform to the game's format requirements"}}, - {"invalid-png", {WarningType::InvalidPNG, WarningLevel::Err, "Issues arising when processing PNG data"}}, - {"invalid-extracted-data", {WarningType::InvalidExtractedData, WarningLevel::Err, "Extracted data does not have correct form"}}, - {"missing-segment", {WarningType::MissingSegment, WarningLevel::Warn, "Segment not given in File tag in XML"}}, - {"hardcoded-pointer", {WarningType::HardcodedPointer, WarningLevel::Warn, "ZAPD lacks the info to make a symbol, so must output a hardcoded pointer"}}, - {"not-implemented", {WarningType::NotImplemented, WarningLevel::Warn, "ZAPD does not currently support this feature"}}, -}; - -/** - * Map constructed at runtime to contain the warning features as set by the user using -W flags. - */ -static std::unordered_map warningTypeToInfoMap; - -void WarningHandler::ConstructTypeToInfoMap() { - for (auto& entry : warningStringToInitMap) { - warningTypeToInfoMap[entry.second.type] = {entry.second.defaultLevel, entry.first, entry.second.description}; - } - warningTypeToInfoMap[WarningType::Always] = {WarningLevel::Warn, "always", "you shouldn't be reading this"}; - assert(warningTypeToInfoMap.size() == static_cast(WarningType::Max)); -} - -/** - * Initialises the main warning type map and reads flags passed to set each warning type's level. - */ -void WarningHandler::Init(int argc, char* argv[]) { - ConstructTypeToInfoMap(); - - bool werror = false; - for (int i = 1; i < argc; i++) { - // If it doesn't start with "-W" skip it. - if (argv[i][0] != '-' || argv[i][1] != 'W' || argv[i][2] == '\0') { - continue; - } - - WarningLevel warningTypeOn = WarningLevel::Warn; - size_t startingIndex = 2; - - // "-Wno-" - if (argv[i][2] == 'n' && argv[i][3] == 'o' && argv[i][4] == '-' && argv[i][5] != '\0') { - warningTypeOn = WarningLevel::Off; - startingIndex = 5; - } - - // Read starting after the "-W" or "-Wno-" - std::string_view currentArgv = &argv[i][startingIndex]; - - if (currentArgv == "error") { - werror = warningTypeOn != WarningLevel::Off; - } else if (currentArgv == "everything") { - for (auto& it: warningTypeToInfoMap) { - if (it.second.level <= WarningLevel::Warn) { - it.second.level = warningTypeOn; - } - } - } else { - // "-Werror=" / "-Wno-error=" parser - if (currentArgv.rfind("error=", 0) == 0) { - // Read starting after the "error=" part - currentArgv = &argv[i][startingIndex + 6]; - warningTypeOn = warningTypeOn != WarningLevel::Off ? WarningLevel::Err : WarningLevel::Warn; - } - - auto it = warningStringToInitMap.find(std::string(currentArgv)); - if (it != warningStringToInitMap.end()) { - warningTypeToInfoMap[it->second.type].level = warningTypeOn; - } - else { - HANDLE_WARNING(WarningType::Always, StringHelper::Sprintf("unknown warning flag '%s'", argv[i]), ""); - } - } - } - - if (werror) { - for (auto& it: warningTypeToInfoMap) { - if (it.second.level >= WarningLevel::Warn) { - it.second.level = WarningLevel::Err; - } - } - } -} - -bool WarningHandler::IsWarningEnabled(WarningType warnType) { - assert(static_cast(warnType) >= 0 && warnType < WarningType::Max); - - return warningTypeToInfoMap.at(warnType).level != WarningLevel::Off; -} - -bool WarningHandler::WasElevatedToError(WarningType warnType) { - assert(static_cast(warnType) >= 0 && warnType < WarningType::Max); - - if (!IsWarningEnabled(warnType)) { - return false; - } - - return warningTypeToInfoMap.at(warnType).level >= WarningLevel::Err; -} - -/** - * Print file/line/function info for debugging - */ -void WarningHandler::FunctionPreamble(const char* filename, int32_t line, const char* function) { - bool forcePrint = false; - -#ifdef DEVELOPMENT - forcePrint = true; -#endif - - fprintf(stderr, "\n"); - - if (forcePrint || Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) { - fprintf(stderr, "%s:%i: in function <%s>:\n", filename, line, function); - } -} - -/** - * Print the information about the file(s) being processed (XML for extraction, png etc. for building) - */ -void WarningHandler::ProcessedFilePreamble() { - if (Globals::Instance->inputPath != "") { - fprintf(stderr, "When processing file %s: ", Globals::Instance->inputPath.c_str()); - } -} - -/** - * Print information about the binary file being extracted - */ -void WarningHandler::ExtractedFilePreamble(const ZFile *parent, const ZResource* res, const uint32_t offset) { - fprintf(stderr, "in input binary file %s, ", parent->GetName().c_str()); - if (res != nullptr) { - fprintf(stderr, "resource '%s' at ", res->GetName().c_str()); - } - fprintf(stderr, "offset 0x%06X: \n\t", offset); -} - -/** - * Construct the rest of the message, after warning:/error. The message is filled in one character at a time, with indents added after newlines - */ -std::string WarningHandler::ConstructMessage(std::string message, const std::string& header, const std::string& body) { - message.reserve(message.size() + header.size() + body.size() + 10 * (sizeof(HANG_INDT) - 1)); - message += StringHelper::Sprintf(HILITE("%s"), header.c_str()); - message += "\n"; - - if (body == "") { - return message; - } - - message += HANG_INDT; - for (const char* ptr = body.c_str(); *ptr != '\0'; ptr++) { - message += *ptr; - if (*ptr == '\n') { - message += HANG_INDT; - } - } - message += "\n"; - - return message; -} - -/* Error module functions */ - -void WarningHandler::PrintErrorAndThrow(const std::string& header, const std::string& body) { - std::string errorMsg = ERR_FMT("error: "); - throw std::runtime_error(ConstructMessage(errorMsg, header, body)); -} - -/* Error types, to be used via the macros */ - -void WarningHandler::ErrorType(WarningType warnType, const std::string& header, const std::string& body) { - std::string headerMsg = header; - - for (const auto& iter: warningStringToInitMap) { - if (iter.second.type == warnType) { - headerMsg += StringHelper::Sprintf(" [%s]", iter.first.c_str()); - } - } - - PrintErrorAndThrow(headerMsg, body); -} - -void WarningHandler::Error_Plain(const char* filename, int32_t line, const char* function, WarningType warnType, const std::string& header, const std::string& body) { - FunctionPreamble(filename, line, function); - - ErrorType(warnType, header, body); -} - -void WarningHandler::Error_Process(const char* filename, int32_t line, const char* function, WarningType warnType, const std::string& header, const std::string& body) { - FunctionPreamble(filename, line, function); - ProcessedFilePreamble(); - - ErrorType(warnType, header, body); -} - -void WarningHandler::Error_Resource(const char* filename, int32_t line, const char* function, WarningType warnType, const ZFile *parent, const ZResource* res, const uint32_t offset, const std::string& header, const std::string& body) { - assert(parent != nullptr); - - FunctionPreamble(filename, line, function); - ProcessedFilePreamble(); - ExtractedFilePreamble(parent, res, offset); - - ErrorType(warnType, header, body); -} - -/* Warning module functions */ - -void WarningHandler::PrintWarningBody(const std::string& header, const std::string& body) { - std::string errorMsg = WARN_FMT("warning: "); - fprintf(stderr, "%s", ConstructMessage(errorMsg, header, body).c_str()); -} - -void WarningHandler::WarningTypeAndChooseEscalate(WarningType warnType, const std::string& header, const std::string& body) { - std::string headerMsg = header; - - for (const auto& iter: warningStringToInitMap) { - if (iter.second.type == warnType) { - headerMsg += StringHelper::Sprintf(" [-W%s]", iter.first.c_str()); - } - } - - if (WasElevatedToError(warnType)) { - PrintErrorAndThrow(headerMsg, body); - } else { - PrintWarningBody(headerMsg, body); - } -} - - -/* Warning types, to be used via the macros */ - -void WarningHandler::Warning_Plain(const char* filename, int32_t line, const char* function, WarningType warnType, const std::string& header, const std::string& body) { - if (!IsWarningEnabled(warnType)) { - return; - } - - FunctionPreamble(filename, line, function); - - WarningTypeAndChooseEscalate(warnType, header, body); -} - -void WarningHandler::Warning_Process(const char* filename, int32_t line, const char* function, WarningType warnType, const std::string& header, const std::string& body) { - if (!IsWarningEnabled(warnType)) { - return; - } - - FunctionPreamble(filename, line, function); - ProcessedFilePreamble(); - - WarningTypeAndChooseEscalate(warnType, header, body); -} - -void WarningHandler::Warning_Resource(const char* filename, int32_t line, const char* function, WarningType warnType, const ZFile *parent, const ZResource* res, const uint32_t offset, const std::string& header, const std::string& body) { - assert(parent != nullptr); - - if (!IsWarningEnabled(warnType)) { - return; - } - - FunctionPreamble(filename, line, function); - ProcessedFilePreamble(); - ExtractedFilePreamble(parent, res, offset); - - WarningTypeAndChooseEscalate(warnType, header, body); -} - - -/* Help-related functions */ - -#include - -/** - * Print each warning name, default status, and description using the init map - */ -void WarningHandler::PrintHelp() { - std::set sortedKeys; - WarningInfoInit warningInfo; - uint32_t columnWidth = 25; - std::string dt; - - // Sort keys through the magic of `set`, to print in alphabetical order - for (auto& it : warningStringToInitMap) { - sortedKeys.insert(it.first); - } - - printf("\nWarning types ( * means enabled by default)\n"); - for (auto& key : sortedKeys) { - warningInfo = warningStringToInitMap.at(key); - if (warningInfo.defaultLevel <= WarningLevel::Warn) { - dt = "-W"; - dt += key; - if (warningInfo.defaultLevel == WarningLevel::Warn) { - dt += " *"; - } - printf(HELP_DT_INDT "%-*s", columnWidth, dt.c_str()); - - if (dt.length() + 2 > columnWidth) { - printf("\n" HELP_DT_INDT "%-*s", columnWidth, ""); - } - printf("%s\n", warningInfo.description.c_str()); - } - } - - printf("\nDefault errors\n"); - for (auto& key : sortedKeys) { - if (warningInfo.defaultLevel > WarningLevel::Warn) { - dt = "-W"; - dt += key; - printf(HELP_DT_INDT "%-*s", columnWidth, dt.c_str()); - - if (dt.length() + 2 > columnWidth) { - printf("\n" HELP_DT_INDT "%*s", columnWidth, ""); - } - printf("%s\n", warningInfo.description.c_str()); - } - } - - printf("\n"); - printf("Other\n" HELP_DT_INDT "-Weverything will enable all existing warnings.\n" HELP_DT_INDT "-Werror will promote all warnings to errors.\n"); - - printf("\n"); - printf("Warnings can be disabled using -Wno-... instead of -W...; -Weverything will override any -Wno-... flags passed before it.\n"); -} - -/** - * Print which warnings are currently enabled - */ -void WarningHandler::PrintWarningsDebugInfo() -{ - std::string dt; - - printf("Warnings status:\n"); - for (auto& it: warningTypeToInfoMap) { - dt = it.second.name; - dt += ": "; - - printf(HELP_DT_INDT "%-25s", dt.c_str()); - switch (it.second.level) - { - case WarningLevel::Off: - printf(VT_FGCOL(LIGHTGRAY) "Off" VT_RST); - break; - case WarningLevel::Warn: - printf(VT_FGCOL(YELLOW) "Warn" VT_RST); - break; - case WarningLevel::Err: - printf(VT_FGCOL(RED) "Err" VT_RST); - break; - - } - printf("\n"); - } - printf("\n"); -} diff --git a/ZAPDTR/ZAPD/WarningHandler.h b/ZAPDTR/ZAPD/WarningHandler.h deleted file mode 100644 index bb0360a81..000000000 --- a/ZAPDTR/ZAPD/WarningHandler.h +++ /dev/null @@ -1,145 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -#include "Utils/vt.h" -#include "ZFile.h" - -#ifdef _MSC_VER -#define __PRETTY_FUNCTION__ __FUNCSIG__ -#elif not defined(__GNUC__) -#define __PRETTY_FUNCTION__ __func__ -#endif - -// ======================================= -/* Formatting macros */ - -// TODO: move this somewhere else so it can be used by other help -#define HELP_DT_INDT " " - -/* Macros for formatting warnings/errors */ -#define VT_HILITE VT_BOLD_FGCOL(WHITE) -#define VT_WARN VT_BOLD_FGCOL(PURPLE) -#define VT_ERR VT_BOLD_FGCOL(RED) - -#define HILITE(string) (VT_HILITE string VT_RST) -#define WARN_FMT(string) (VT_WARN string VT_RST) -#define ERR_FMT(string) (VT_ERR string VT_RST) - -// Maybe make WARN_LF instead -// Currently 8 spaces -#define WARN_INDT " " -// Currently 16 spaces -#define HANG_INDT " " - -// ======================================= -/* Warning and error macros */ -// TODO: better names - -// General-purpose, plain style (only prints function,file,line in the preamble) -#define HANDLE_ERROR(warningType, header, body) \ - WarningHandler::Error_Plain(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, header, body) -#define HANDLE_WARNING(warningType, header, body) \ - WarningHandler::Warning_Plain(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, header, \ - body) - -// For processing XMLs or textures/blobs (preamble contains function,file,line; processed file) -#define HANDLE_ERROR_PROCESS(warningType, header, body) \ - WarningHandler::Error_Process(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, header, \ - body) -#define HANDLE_WARNING_PROCESS(warningType, header, body) \ - WarningHandler::Warning_Process(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, header, \ - body) - -// For ZResource-related stuff (preamble contains function,file,line; processed file; extracted file -// and offset) -#define HANDLE_ERROR_RESOURCE(warningType, parent, resource, offset, header, body) \ - WarningHandler::Error_Resource(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, parent, \ - resource, offset, header, body) -#define HANDLE_WARNING_RESOURCE(warningType, parent, resource, offset, header, body) \ - WarningHandler::Warning_Resource(__FILE__, __LINE__, __PRETTY_FUNCTION__, warningType, parent, \ - resource, offset, header, body) - -// ======================================= - -enum class WarningType -{ - Always, // Warnings of this type are always printed, cannot be disabled. - Deprecated, - Unaccounted, - MissingOffsets, - Intersection, - MissingAttribute, - InvalidAttributeValue, - UnknownAttribute, - InvalidXML, - InvalidJPEG, - InvalidPNG, - InvalidExtractedData, - MissingSegment, - HardcodedPointer, - NotImplemented, - Max, -}; - -enum class WarningLevel -{ - Off, - Warn, - Err, -}; - -class WarningHandler -{ -public: - static void ConstructTypeToInfoMap(); - - static void Init(int argc, char* argv[]); - - static bool IsWarningEnabled(WarningType warnType); - static bool WasElevatedToError(WarningType warnType); - - static void FunctionPreamble(const char* filename, int32_t line, const char* function); - static void ProcessedFilePreamble(); - static void ExtractedFilePreamble(const ZFile* parent, const ZResource* res, - const uint32_t offset); - static std::string ConstructMessage(std::string message, const std::string& header, - const std::string& body); - - [[noreturn]] static void PrintErrorAndThrow(const std::string& header, const std::string& body); - static void PrintWarningBody(const std::string& header, const std::string& body); - - [[noreturn]] static void ErrorType(WarningType warnType, const std::string& header, - const std::string& body); - [[noreturn]] static void Error_Plain(const char* filename, int32_t line, const char* function, - WarningType warnType, const std::string& header, - const std::string& body); - [[noreturn]] static void Error_Process(const char* filename, int32_t line, const char* function, - WarningType warnType, const std::string& header, - const std::string& body); - [[noreturn]] static void Error_Resource(const char* filename, int32_t line, - const char* function, WarningType warnType, - const ZFile* parent, const ZResource* res, - const uint32_t offset, const std::string& header, - const std::string& body); - - static void WarningTypeAndChooseEscalate(WarningType warnType, const std::string& header, - const std::string& body); - - static void Warning_Plain(const char* filename, int32_t line, const char* function, - WarningType warnType, const std::string& header, - const std::string& body); - static void Warning_Process(const char* filename, int32_t line, const char* function, - WarningType warnType, const std::string& header, - const std::string& body); - static void Warning_Resource(const char* filename, int32_t line, const char* function, - WarningType warnType, const ZFile* parent, const ZResource* res, - const uint32_t offset, const std::string& header, - const std::string& body); - - static void PrintHelp(); - static void PrintWarningsDebugInfo(); -}; diff --git a/ZAPDTR/ZAPD/ZAPD.vcxproj b/ZAPDTR/ZAPD/ZAPD.vcxproj deleted file mode 100644 index 505e41100..000000000 --- a/ZAPDTR/ZAPD/ZAPD.vcxproj +++ /dev/null @@ -1,372 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {B53F9E5B-0A58-4BAE-9AFE-856C8CBB8D36} - ZAPD - 10.0 - ZAPD - - - - Application - true - v142 - MultiByte - - - Application - false - v142 - true - MultiByte - - - Application - true - v142 - MultiByte - - - Application - false - v142 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - $(OutDir);$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\packages\libpng-v142.1.6.37.2\build\native\lib\x64\v142\Debug\;$(LibraryPath) - $(ProjectDir)..\ZAPDUtils;$(ProjectDir)..\lib\tinyxml2;$(ProjectDir)..\lib\libgfxd;$(ProjectDir)..\lib\elfio;$(ProjectDir)..\lib\stb;$(ProjectDir);$(IncludePath) - - - $(IncludePath) - - - $(SolutionDir)ZAPD\lib\tinyxml2;$(SolutionDir)ZAPD\lib\libgfxd;$(SolutionDir)ZAPD\lib\elfio;$(SolutionDir)ZAPD\lib\stb;$(ProjectDir);$(IncludePath) - $(SolutionDir)ZAPD\lib\libgfxd;$(SolutionDir)x64\Debug;$(SolutionDir)packages\libpng.1.6.28.1\build\native\lib\x64\v140\dynamic\Debug;$(LibraryPath) - - - - Level3 - Disabled - true - true - stdcpp17 - stdc11 - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - true - Console - - - cd .. -mkdir build\ZAPD - python ZAPD/genbuildinfo.py - - - - - Level3 - Disabled - true - true - stdcpp17 - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks - stdc11 - MultiThreadedDebug - true - - - true - ZAPDUtils.lib;/WHOLEARCHIVE:ExporterExample.lib;%(AdditionalDependencies) - false - Console - - - cd .. -mkdir build\ZAPD - python ZAPD/genbuildinfo.py - - - - - Level3 - MaxSpeed - true - true - true - true - true - - - true - true - - - cd .. -mkdir build\ZAPD - python ZAPD/genbuildinfo.py - - - - - Level3 - MaxSpeed - true - true - true - true - stdcpplatest - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - true - true - - - cd .. -mkdir build\ZAPD - python ZAPD/genbuildinfo.py - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZAPD.vcxproj.filters b/ZAPDTR/ZAPD/ZAPD.vcxproj.filters deleted file mode 100644 index ce89882fe..000000000 --- a/ZAPDTR/ZAPD/ZAPD.vcxproj.filters +++ /dev/null @@ -1,572 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {02148456-5068-4613-8478-f10addc58e70} - - - {bcab3136-95ba-4839-833c-43d78ad6e335} - - - {dc06ed84-f6fe-4277-80f3-d62bd5cdbb98} - - - {6049c045-bc38-4221-b29e-ca6d4d8af4aa} - - - {490e3a08-047b-48d3-ab53-3a860a3b92aa} - - - {26c06845-8e8e-4b79-ad18-07c4f9c0f801} - - - {d45c420d-2378-47ac-92c5-80db9475c195} - - - {03cc56a2-e0e8-4167-80a0-98fb900a959a} - - - {73db0879-6df8-4f6a-8cc2-a1f836e9e796} - - - {be9a5be0-ec6a-4200-8e39-bb58c7da7aa8} - - - {7ee79d97-c6a8-4e82-93ef-37981f4d7838} - - - {85600275-99fe-491d-8189-bcc3dc1a8903} - - - {ba9990b0-1082-48bb-874c-6108534b5455} - - - {ce9d91b0-ba20-4296-bc2d-8630965bb392} - - - {730beb67-6d59-4849-9d9b-702c4a565fc0} - - - - - Source Files - - - Source Files\Z64\ZRoom - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Libraries\libgfxd - - - Source Files\Z64 - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files\Z64\ZRoom\Commands - - - Source Files\Z64 - - - Source Files - - - Source Files - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files\Z64 - - - Source Files - - - Source Files\Z64 - - - - - Header Files\Z64\ZRoom - - - Header Files\Z64\ZRoom - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files\Libraries\elfio - - - Header Files - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Libraries - - - Header Files\Libraries - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Libraries\libgfxd - - - Header Files\Libraries\libgfxd - - - Header Files\Libraries\libgfxd - - - Header Files\Z64 - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64\ZRoom\Commands - - - Header Files\Z64 - - - Header Files\Z64\ZRoom\Commands - - - Header Files - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files\Z64 - - - Header Files - - - Header Files\Z64 - - - - - Resource Files - - - any\any - - - NuGet - - - - - - \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZActorList.cpp b/ZAPDTR/ZAPD/ZActorList.cpp deleted file mode 100644 index ee5cb4d44..000000000 --- a/ZAPDTR/ZAPD/ZActorList.cpp +++ /dev/null @@ -1,194 +0,0 @@ -#include "ZActorList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "WarningHandler.h" -#include "ZFile.h" -#include "ZRoom/ZNames.h" - -REGISTER_ZFILENODE(ActorList, ZActorList); - -ZActorList::ZActorList(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("Count"); -} - -void ZActorList::ExtractFromBinary(uint32_t nRawDataIndex, uint8_t nNumActors) -{ - rawDataIndex = nRawDataIndex; - numActors = nNumActors; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); -} - -void ZActorList::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - numActors = StringHelper::StrToL(registeredAttributes.at("Count").value); - - if (numActors < 1) - { - HANDLE_ERROR_RESOURCE( - WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("invalid value '%d' found for 'NumPaths' attribute", numActors), - "Should be at least '1'"); - } -} - -void ZActorList::ParseRawData() -{ - ZResource::ParseRawData(); - - offset_t currentPtr = rawDataIndex; - size_t largestlength = 0; - - for (size_t i = 0; i < numActors; i++) - { - ActorSpawnEntry entry(parent->GetRawData(), currentPtr); - - currentPtr += entry.GetRawDataSize(); - actors.push_back(entry); - - size_t actorNameLength = ZNames::GetActorName(entry.GetActorId()).size(); - if (actorNameLength > largestlength) - largestlength = actorNameLength; - } - - for (auto& entry : actors) - { - entry.SetLargestActorName(largestlength); - } -} - -Declaration* ZActorList::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), name, GetActorListArraySize(), bodyStr); - decl->staticConf = staticConf; - - return decl; -} - -std::string ZActorList::GetBodySourceCode() const -{ - std::string declaration; - - size_t index = 0; - for (auto& entry : actors) - { - declaration += StringHelper::Sprintf("\t{ %s },", entry.GetBodySourceCode().c_str()); - - if (index < actors.size() - 1) - declaration += "\n"; - - index++; - } - - return declaration; -} - -std::string ZActorList::GetSourceTypeName() const -{ - return actors.front().GetSourceTypeName(); -} - -ZResourceType ZActorList::GetResourceType() const -{ - return ZResourceType::ActorList; -} - -size_t ZActorList::GetRawDataSize() const -{ - return actors.size() * actors.front().GetRawDataSize(); -} - -size_t ZActorList::GetActorListArraySize() const -{ - size_t actorCount = 0; - - // Doing an else-if here so we only do the loop when the game is SW97. - // Actor 0x22 is removed from SW97, so we need to ensure that we don't increment the actor count - // for it. - if (Globals::Instance->game == ZGame::OOT_SW97) - { - actorCount = 0; - - for (const auto& entry : actors) - if (entry.GetActorId() != 0x22) - actorCount++; - } - else - { - actorCount = actors.size(); - } - - return actorCount; -} - -/* ActorSpawnEntry */ - -ActorSpawnEntry::ActorSpawnEntry(const std::vector& rawData, uint32_t rawDataIndex) -{ - actorNum = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - posX = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - posY = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - posZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - rotX = BitConverter::ToUInt16BE(rawData, rawDataIndex + 8); - rotY = BitConverter::ToUInt16BE(rawData, rawDataIndex + 10); - rotZ = BitConverter::ToUInt16BE(rawData, rawDataIndex + 12); - params = BitConverter::ToInt16BE(rawData, rawDataIndex + 14); -} - -std::string ActorSpawnEntry::GetBodySourceCode() const -{ - std::string body; - - std::string actorNameFmt = StringHelper::Sprintf("%%-%zus ", largestActorName + 1); - body = - StringHelper::Sprintf(actorNameFmt.c_str(), (ZNames::GetActorName(actorNum) + ",").c_str()); - - body += StringHelper::Sprintf("{ %6i, %6i, %6i }, ", posX, posY, posZ); - if (Globals::Instance->game == ZGame::MM_RETAIL) - body += StringHelper::Sprintf("{ SPAWN_ROT_FLAGS(%#5hX, 0x%04X)" - ", SPAWN_ROT_FLAGS(%#5hX, 0x%04X)" - ", SPAWN_ROT_FLAGS(%#5hX, 0x%04X) }, ", - (rotX >> 7) & 0b111111111, rotX & 0b1111111, - (rotY >> 7) & 0b111111111, rotY & 0b1111111, - (rotZ >> 7) & 0b111111111, rotZ & 0b1111111); - else - body += StringHelper::Sprintf("{ %#6hX, %#6hX, %#6hX }, ", rotX, rotY, rotZ); - body += StringHelper::Sprintf("0x%04X", params); - - return body; -} - -std::string ActorSpawnEntry::GetSourceTypeName() const -{ - return "ActorEntry"; -} - -size_t ActorSpawnEntry::GetRawDataSize() const -{ - return 16; -} - -uint16_t ActorSpawnEntry::GetActorId() const -{ - return actorNum; -} - -void ActorSpawnEntry::SetLargestActorName(size_t nameSize) -{ - largestActorName = nameSize; -} diff --git a/ZAPDTR/ZAPD/ZActorList.h b/ZAPDTR/ZAPD/ZActorList.h deleted file mode 100644 index 7cc63da2f..000000000 --- a/ZAPDTR/ZAPD/ZActorList.h +++ /dev/null @@ -1,52 +0,0 @@ -#pragma once - -#include "ZResource.h" - -class ActorSpawnEntry -{ -public: - uint16_t actorNum; - int16_t posX; - int16_t posY; - int16_t posZ; - uint16_t rotX; - uint16_t rotY; - uint16_t rotZ; - uint16_t params; - size_t largestActorName = 16; - - ActorSpawnEntry(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - - std::string GetSourceTypeName() const; - size_t GetRawDataSize() const; - - uint16_t GetActorId() const; - void SetLargestActorName(size_t nameSize); -}; - -class ZActorList : public ZResource -{ -public: - std::vector actors; - uint32_t numActors = 0; - - ZActorList(ZFile* nParent); - - void ExtractFromBinary(offset_t nRawDataIndex, uint8_t nNumActors); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -protected: - size_t GetActorListArraySize() const; -}; diff --git a/ZAPDTR/ZAPD/ZAnimation.cpp b/ZAPDTR/ZAPD/ZAnimation.cpp deleted file mode 100644 index 199851415..000000000 --- a/ZAPDTR/ZAPD/ZAnimation.cpp +++ /dev/null @@ -1,580 +0,0 @@ -#include "ZAnimation.h" - -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Animation, ZNormalAnimation); -REGISTER_ZFILENODE(PlayerAnimation, ZLinkAnimation); -REGISTER_ZFILENODE(CurveAnimation, ZCurveAnimation); -REGISTER_ZFILENODE(LegacyAnimation, ZLegacyAnimation); - -ZAnimation::ZAnimation(ZFile* nParent) : ZResource(nParent) -{ - frameCount = 0; - genOTRDef = true; -} - -void ZAnimation::ParseRawData() -{ - ZResource::ParseRawData(); - - frameCount = BitConverter::ToInt16BE(parent->GetRawData(), rawDataIndex + 0); -} - -/* -std::string ZAnimation::GetSourceOutputHeader(const std::string& prefix) -{ - if (Globals::Instance->otrMode) - { - std::string str = ""; - str += StringHelper::Sprintf("#define %s \"__OTR__%s/%s\"", name.c_str(), parent->GetOutName().c_str(), name.c_str()); - - return str; - } - else - return ZResource::GetSourceOutputHeader(prefix); -} -*/ - -ZResourceType ZAnimation::GetResourceType() const -{ - return ZResourceType::Animation; -} - -/* ZNormalAnimation */ - -ZNormalAnimation::ZNormalAnimation(ZFile* nParent) : ZAnimation(nParent) -{ -} - -size_t ZNormalAnimation::GetRawDataSize() const -{ - return 16; -} - -std::string ZNormalAnimation::GetSourceTypeName() const -{ - return "AnimationHeader"; -} - -void ZNormalAnimation::ParseRawData() -{ - ZAnimation::ParseRawData(); - - auto& data = parent->GetRawData(); - - rotationValuesSeg = BitConverter::ToInt32BE(data, rawDataIndex + 4); - rotationIndicesSeg = BitConverter::ToInt32BE(data, rawDataIndex + 8); - limit = BitConverter::ToInt16BE(data, rawDataIndex + 12); - - rotationValuesOffset = Seg2Filespace(rotationValuesSeg, parent->baseAddress); - rotationIndicesOffset = Seg2Filespace(rotationIndicesSeg, parent->baseAddress); - - uint32_t currentPtr = rotationValuesOffset; - - // Read the Rotation Values - for (uint32_t i = 0; i < ((rotationIndicesOffset - rotationValuesOffset) / 2); i++) - { - rotationValues.push_back(BitConverter::ToInt16BE(data, currentPtr)); - currentPtr += 2; - } - - currentPtr = rotationIndicesOffset; - - // Read the Rotation Indices - for (uint32_t i = 0; i < ((rawDataIndex - rotationIndicesOffset) / 6); i++) - { - rotationIndices.push_back(RotationIndex(BitConverter::ToInt16BE(data, currentPtr), - BitConverter::ToInt16BE(data, currentPtr + 2), - BitConverter::ToInt16BE(data, currentPtr + 4))); - currentPtr += 6; - } -} - -void ZNormalAnimation::DeclareReferences(const std::string& prefix) -{ - std::string defaultPrefix = prefix.c_str(); - if (name != "") - defaultPrefix = name; - - // replace g prefix with s for local variables - if (defaultPrefix.at(0) == 'g') - defaultPrefix.replace(0, 1, "s"); - - std::string indicesStr = ""; - std::string valuesStr = " "; - const uint8_t lineLength = 14; - const uint8_t offset = 0; - - if (!Globals::Instance->otrMode) - { - for (size_t i = 0; i < rotationValues.size(); i++) - { - valuesStr += StringHelper::Sprintf("0x%04X, ", rotationValues[i]); - - if ((i - offset + 1) % lineLength == 0) - valuesStr += "\n "; - } - } - - parent->AddDeclarationArray(rotationValuesOffset, DeclarationAlignment::Align4, - rotationValues.size() * 2, "s16", - StringHelper::Sprintf("%sFrameData", defaultPrefix.c_str()), - rotationValues.size(), valuesStr); - - if (!Globals::Instance->otrMode) - { - for (size_t i = 0; i < rotationIndices.size(); i++) - { - indicesStr += - StringHelper::Sprintf(" { 0x%04X, 0x%04X, 0x%04X },", rotationIndices[i].x, - rotationIndices[i].y, rotationIndices[i].z); - - if (i != (rotationIndices.size() - 1)) - indicesStr += "\n"; - } - } - - parent->AddDeclarationArray(rotationIndicesOffset, DeclarationAlignment::Align4, - rotationIndices.size() * 6, "JointIndex", - StringHelper::Sprintf("%sJointIndices", defaultPrefix.c_str()), - rotationIndices.size(), indicesStr); -} - -std::string ZNormalAnimation::GetBodySourceCode() const -{ - std::string frameDataName; - Globals::Instance->GetSegmentedPtrName(rotationValuesSeg, parent, "s16", frameDataName, - parent->workerID); - std::string jointIndicesName; - Globals::Instance->GetSegmentedPtrName(rotationIndicesSeg, parent, "JointIndex", - jointIndicesName, parent->workerID); - - std::string headerStr = - StringHelper::Sprintf("\n\t{ %i }, %s,\n", frameCount, frameDataName.c_str()); - headerStr += StringHelper::Sprintf("\t%s, %i\n", jointIndicesName.c_str(), limit); - - return headerStr; -} - -/* ZLinkAnimation */ - -ZLinkAnimation::ZLinkAnimation(ZFile* nParent) : ZAnimation(nParent) -{ - segmentAddress = 0; -} - -size_t ZLinkAnimation::GetRawDataSize() const -{ - return 8; -} - -std::string ZLinkAnimation::GetSourceTypeName() const -{ - return "LinkAnimationHeader"; -} - -void ZLinkAnimation::ParseRawData() -{ - ZAnimation::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - segmentAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 4); -} - -std::string ZLinkAnimation::GetBodySourceCode() const -{ - std::string segSymbol; - Globals::Instance->GetSegmentedPtrName(segmentAddress, parent, "", segSymbol, parent->workerID); - - return StringHelper::Sprintf("\n\t{ %i }, %s\n", frameCount, segSymbol.c_str()); -} - -/* ZCurveAnimation */ - -TransformData::TransformData(ZFile* parent, const std::vector& rawData, - uint32_t fileOffset) - : parent(parent) -{ - unk_00 = BitConverter::ToUInt16BE(rawData, fileOffset + 0); - unk_02 = BitConverter::ToUInt16BE(rawData, fileOffset + 2); - unk_04 = BitConverter::ToInt16BE(rawData, fileOffset + 4); - unk_06 = BitConverter::ToInt16BE(rawData, fileOffset + 6); - unk_08 = BitConverter::ToFloatBE(rawData, fileOffset + 8); -} - -TransformData::TransformData(ZFile* parent, const std::vector& rawData, - uint32_t fileOffset, size_t index) - : TransformData(parent, rawData, fileOffset + index * GetRawDataSize()) -{ -} - -std::string TransformData::GetBody([[maybe_unused]] const std::string& prefix) const -{ - return StringHelper::Sprintf("0x%04X, 0x%04X, %i, %i, %ff", unk_00, unk_02, unk_04, unk_06, - unk_08); -} - -size_t TransformData::GetRawDataSize() const -{ - return 0x0C; -} - -std::string TransformData::GetSourceTypeName() -{ - return "TransformData"; -} - -ZCurveAnimation::ZCurveAnimation(ZFile* nParent) : ZAnimation(nParent) -{ - RegisterOptionalAttribute("SkelOffset"); -} - -void ZCurveAnimation::ParseXML(tinyxml2::XMLElement* reader) -{ - ZAnimation::ParseXML(reader); - - std::string skelOffsetXml = registeredAttributes.at("SkelOffset").value; - if (skelOffsetXml == "") - { - HANDLE_ERROR_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - "missing 'SkelOffset' attribute in ", - "You need to provide the offset of the curve skeleton."); - } - skelOffset = StringHelper::StrToL(skelOffsetXml, 0); -} - -void ZCurveAnimation::ParseRawData() -{ - ZAnimation::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - refIndex = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0); - transformData = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); - copyValues = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - unk_0C = BitConverter::ToInt16BE(rawData, rawDataIndex + 12); - unk_10 = BitConverter::ToInt16BE(rawData, rawDataIndex + 14); - - uint32_t limbCountAddress = Seg2Filespace(skelOffset, parent->baseAddress) + 4; - limbCount = BitConverter::ToUInt8BE(rawData, limbCountAddress); - - size_t transformDataSize = 0; - size_t copyValuesSize = 0; - if (refIndex != 0) - { - uint32_t refIndexOffset = Seg2Filespace(refIndex, parent->baseAddress); - for (size_t i = 0; i < 3 * 3 * limbCount; i++) - { - uint8_t ref = BitConverter::ToUInt8BE(rawData, refIndexOffset + i); - if (ref == 0) - copyValuesSize++; - else - transformDataSize += ref; - - refIndexArr.emplace_back(ref); - } - } - - if (transformData != 0) - { - uint32_t transformDataOffset = Seg2Filespace(transformData, parent->baseAddress); - - for (size_t i = 0; i < transformDataSize; i++) - transformDataArr.emplace_back(parent, rawData, transformDataOffset, i); - } - - if (copyValues != 0) - { - uint32_t copyValuesOffset = Seg2Filespace(copyValues, parent->baseAddress); - - for (size_t i = 0; i < copyValuesSize; i++) - copyValuesArr.emplace_back(BitConverter::ToInt16BE(rawData, copyValuesOffset + i * 2)); - } -} - -void ZCurveAnimation::DeclareReferences(const std::string& prefix) -{ - if (refIndex != 0) - { - uint32_t refIndexOffset = Seg2Filespace(refIndex, parent->baseAddress); - std::string refIndexStr = - StringHelper::Sprintf("%sCurveAnime_%s_%06X", prefix.c_str(), "Ref", refIndexOffset); - - std::string entryStr = " "; - uint16_t arrayItemCnt = refIndexArr.size(); - - size_t i = 0; - for (auto& child : refIndexArr) - { - entryStr += StringHelper::Sprintf("0x%02X, %s", child, (i++ % 8 == 7) ? "\n " : ""); - } - - Declaration* decl = parent->GetDeclaration(refIndexOffset); - if (decl == nullptr) - { - parent->AddDeclarationArray(refIndexOffset, DeclarationAlignment::Align4, - arrayItemCnt * 1, "u8", refIndexStr, arrayItemCnt, - entryStr); - } - else - { - decl->text = entryStr; - } - } - - if (transformData != 0) - { - uint32_t transformDataOffset = Seg2Filespace(transformData, parent->baseAddress); - std::string transformDataStr = StringHelper::Sprintf( - "%sCurveAnime_%s_%06X", prefix.c_str(), - transformDataArr.at(0).GetSourceTypeName().c_str(), transformDataOffset); - - std::string entryStr; - uint16_t arrayItemCnt = transformDataArr.size(); - - size_t i = 0; - for (auto& child : transformDataArr) - { - entryStr += StringHelper::Sprintf(" { %s },%s", child.GetBody(prefix).c_str(), - (++i < arrayItemCnt) ? "\n" : ""); - } - - Declaration* decl = parent->GetDeclaration(transformDataOffset); - if (decl == nullptr) - { - parent->AddDeclarationArray(transformDataOffset, DeclarationAlignment::Align4, - arrayItemCnt * transformDataArr.at(0).GetRawDataSize(), - transformDataArr.at(0).GetSourceTypeName(), - transformDataStr, arrayItemCnt, entryStr); - } - else - { - decl->text = entryStr; - } - } - - if (copyValues != 0) - { - uint32_t copyValuesOffset = Seg2Filespace(copyValues, parent->baseAddress); - std::string copyValuesStr = - StringHelper::Sprintf("%sCurveAnime_%s_%06X", prefix.c_str(), "Copy", copyValuesOffset); - - std::string entryStr = " "; - uint16_t arrayItemCnt = copyValuesArr.size(); - - size_t i = 0; - for (auto& child : copyValuesArr) - { - entryStr += StringHelper::Sprintf("% 6i, %s", child, (i++ % 8 == 7) ? "\n " : ""); - } - - Declaration* decl = parent->GetDeclaration(copyValuesOffset); - if (decl == nullptr) - { - parent->AddDeclarationArray(copyValuesOffset, DeclarationAlignment::Align4, - arrayItemCnt * 2, "s16", copyValuesStr, arrayItemCnt, - entryStr); - } - else - { - decl->text = entryStr; - } - } -} - -std::string ZCurveAnimation::GetBodySourceCode() const -{ - std::string refIndexStr; - Globals::Instance->GetSegmentedPtrName(refIndex, parent, "u8", refIndexStr, parent->workerID); - std::string transformDataStr; - Globals::Instance->GetSegmentedPtrName(transformData, parent, "TransformData", - transformDataStr, parent->workerID); - std::string copyValuesStr; - Globals::Instance->GetSegmentedPtrName(copyValues, parent, "s16", copyValuesStr, - parent->workerID); - - return StringHelper::Sprintf("\n\t%s,\n\t%s,\n\t%s,\n\t%i, %i\n", refIndexStr.c_str(), - transformDataStr.c_str(), copyValuesStr.c_str(), unk_0C, unk_10); -} - -size_t ZCurveAnimation::GetRawDataSize() const -{ - return 0x10; -} - -DeclarationAlignment ZCurveAnimation::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align4; -} - -std::string ZCurveAnimation::GetSourceTypeName() const -{ - return "TransformUpdateIndex"; -} - -/* ZLegacyAnimation */ - -ZLegacyAnimation::ZLegacyAnimation(ZFile* nParent) : ZAnimation(nParent) -{ -} - -void ZLegacyAnimation::ParseRawData() -{ - ZAnimation::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - limbCount = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x02); - frameData = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x04); - jointKey = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x08); - - if (GETSEGNUM(frameData) == parent->segment && GETSEGNUM(jointKey) == parent->segment) - { - uint32_t frameDataOffset = Seg2Filespace(frameData, parent->baseAddress); - uint32_t jointKeyOffset = Seg2Filespace(jointKey, parent->baseAddress); - - uint32_t ptr = frameDataOffset; - for (size_t i = 0; i < (jointKeyOffset - frameDataOffset) / 2; i++) - { - frameDataArray.push_back(BitConverter::ToUInt16BE(rawData, ptr)); - ptr += 2; - } - - ptr = jointKeyOffset; - for (int32_t i = 0; i < limbCount + 1; i++) - { - JointKey key(parent); - key.ExtractFromFile(ptr); - - jointKeyArray.push_back(key); - ptr += key.GetRawDataSize(); - } - } -} - -void ZLegacyAnimation::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = prefix; - if (name != "") - varPrefix = name; - - ZAnimation::DeclareReferences(varPrefix); - - if (!frameDataArray.empty()) - { - uint32_t frameDataOffset = Seg2Filespace(frameData, parent->baseAddress); - if (GETSEGNUM(frameData) == parent->segment && !parent->HasDeclaration(frameDataOffset)) - { - std::string frameDataBody = "\t"; - - for (size_t i = 0; i < frameDataArray.size(); i++) - { - frameDataBody += StringHelper::Sprintf("0x%04X, ", frameDataArray[i]); - - if (i % 8 == 7 && i + 1 < frameDataArray.size()) - frameDataBody += "\n\t"; - } - - std::string frameDataName = StringHelper::Sprintf("%sFrameData", varPrefix.c_str()); - parent->AddDeclarationArray(frameDataOffset, DeclarationAlignment::Align4, - frameDataArray.size() * 2, "s16", frameDataName, - frameDataArray.size(), frameDataBody); - } - } - - if (!jointKeyArray.empty()) - { - uint32_t jointKeyOffset = Seg2Filespace(jointKey, parent->baseAddress); - if (GETSEGNUM(jointKey) == parent->segment && !parent->HasDeclaration(jointKeyOffset)) - { - const auto res = jointKeyArray.at(0); - std::string jointKeyBody; - - for (size_t i = 0; i < jointKeyArray.size(); i++) - { - jointKeyBody += StringHelper::Sprintf("\t{ %s },", - jointKeyArray[i].GetBodySourceCode().c_str()); - - if (i + 1 < jointKeyArray.size()) - jointKeyBody += "\n"; - } - - std::string jointKeyName = StringHelper::Sprintf("%sJointKey", varPrefix.c_str()); - parent->AddDeclarationArray(jointKeyOffset, DeclarationAlignment::Align4, - jointKeyArray.size() * res.GetRawDataSize(), - res.GetSourceTypeName(), jointKeyName, jointKeyArray.size(), - jointKeyBody); - } - } -} - -std::string ZLegacyAnimation::GetBodySourceCode() const -{ - std::string body = "\n"; - - std::string frameDataName; - std::string jointKeyName; - Globals::Instance->GetSegmentedPtrName(frameData, parent, "s16", frameDataName, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(jointKey, parent, "JointKey", jointKeyName, - parent->workerID); - - body += StringHelper::Sprintf("\t%i, %i,\n", frameCount, limbCount); - body += StringHelper::Sprintf("\t%s,\n", frameDataName.c_str()); - body += StringHelper::Sprintf("\t%s\n", jointKeyName.c_str()); - - return body; -} - -std::string ZLegacyAnimation::GetSourceTypeName() const -{ - return "LegacyAnimationHeader"; -} - -size_t ZLegacyAnimation::GetRawDataSize() const -{ - return 0x0C; -} - -JointKey::JointKey(ZFile* nParent) : ZResource(nParent) -{ -} - -void JointKey::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - xMax = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x00); - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x02); - yMax = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x04); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x06); - zMax = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x08); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 0x0A); -} - -std::string JointKey::GetBodySourceCode() const -{ - return StringHelper::Sprintf("%6i, %6i, %6i, %6i, %6i, %6i", xMax, x, yMax, y, zMax, z); -} - -std::string JointKey::GetSourceTypeName() const -{ - return "JointKey"; -} - -ZResourceType JointKey::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t JointKey::GetRawDataSize() const -{ - return 0x0C; -} diff --git a/ZAPDTR/ZAPD/ZAnimation.h b/ZAPDTR/ZAPD/ZAnimation.h deleted file mode 100644 index 956e7faee..000000000 --- a/ZAPDTR/ZAPD/ZAnimation.h +++ /dev/null @@ -1,180 +0,0 @@ -#pragma once - -#include -#include -#include -#include "Vec3s.h" -#include "ZResource.h" -#include "ZSkeleton.h" -#include "tinyxml2.h" - -struct RotationIndex -{ - // uint16_t transX, transY, transZ; - uint16_t x, y, z; - - RotationIndex(uint16_t nX, uint16_t nY, uint16_t nZ) : x(nX), y(nY), z(nZ) {} -}; - -class ZAnimation : public ZResource -{ -public: - int16_t frameCount; - - ZAnimation(ZFile* nParent); - - //std::string GetSourceOutputHeader(const std::string& prefix) override; - ZResourceType GetResourceType() const override; - -protected: - void ParseRawData() override; -}; - -class ZNormalAnimation : public ZAnimation -{ -public: - std::vector rotationValues; - std::vector rotationIndices; - segptr_t rotationValuesSeg = 0; - segptr_t rotationIndicesSeg = 0; - offset_t rotationValuesOffset = 0; - offset_t rotationIndicesOffset = 0; - int16_t limit = 0; - - ZNormalAnimation(ZFile* nParent); - - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - std::string GetSourceTypeName() const override; - - void ParseRawData() override; -}; - -class ZLinkAnimation : public ZAnimation -{ -public: - segptr_t segmentAddress; - - ZLinkAnimation(ZFile* nParent); - - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - std::string GetSourceTypeName() const override; - - void ParseRawData() override; -}; - -class TransformData -{ -public: - ZFile* parent; - - ///* 0x0000 */ u16 unk_00; // appears to be flags - uint16_t unk_00; - ///* 0x0002 */ s16 unk_02; - int16_t unk_02; - ///* 0x0004 */ s16 unk_04; - int16_t unk_04; - ///* 0x0006 */ s16 unk_06; - int16_t unk_06; - ///* 0x0008 */ f32 unk_08; - float unk_08; - -public: - TransformData() = default; - TransformData(ZFile* parent, const std::vector& rawData, uint32_t fileOffset); - TransformData(ZFile* parent, const std::vector& rawData, uint32_t fileOffset, - size_t index); - - [[nodiscard]] std::string GetBody(const std::string& prefix) const; - - size_t GetRawDataSize() const; - std::string GetSourceTypeName(); -}; - -class ZCurveAnimation : public ZAnimation -{ -public: - segptr_t skelOffset = 0; - - ///* 0x0000 */ u8* refIndex; - segptr_t refIndex = 0; - ///* 0x0004 */ TransformData* transformData; - segptr_t transformData = 0; - ///* 0x0008 */ s16* copyValues; - segptr_t copyValues = 0; - ///* 0x000C */ s16 unk_0C; - int16_t unk_0C; - ///* 0x000E */ s16 unk_10; - int16_t unk_10; - - uint8_t limbCount = 0; - - std::vector refIndexArr; - std::vector transformDataArr; - std::vector copyValuesArr; - -public: - ZCurveAnimation(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - - std::string GetSourceTypeName() const override; -}; -// TransformUpdateIndex - -/* ZLegacyAnimation */ - -class JointKey : public ZResource -{ -public: - JointKey(ZFile* nParent); - - void ParseRawData() override; - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -protected: - int16_t xMax, x; - int16_t yMax, y; - int16_t zMax, z; -}; - -class ZLegacyAnimation : public ZAnimation -{ -public: - ZLegacyAnimation(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - - size_t GetRawDataSize() const override; - -protected: - int16_t limbCount; - segptr_t frameData; // s16* - segptr_t jointKey; // JointKey* - - std::vector frameDataArray; - std::vector jointKeyArray; -}; diff --git a/ZAPDTR/ZAPD/ZArray.cpp b/ZAPDTR/ZAPD/ZArray.cpp deleted file mode 100644 index 8725e28cc..000000000 --- a/ZAPDTR/ZAPD/ZArray.cpp +++ /dev/null @@ -1,153 +0,0 @@ -#include "ZArray.h" - -#include - -#include "Globals.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Array, ZArray); - -ZArray::ZArray(ZFile* nParent) : ZResource(nParent) -{ - canHaveInner = true; - genOTRDef = true; - RegisterRequiredAttribute("Count"); -} - -ZArray::~ZArray() -{ - for (auto res : resList) - delete res; -} - -void ZArray::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - arrayCnt = reader->IntAttribute("Count", 0); - if (arrayCnt <= 0) - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'Count' attribute", ""); - } - - tinyxml2::XMLElement* child = reader->FirstChildElement(); - if (child == nullptr) - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidXML, parent, this, rawDataIndex, - " needs one sub-element", ""); - } - - childName = child->Name(); - - auto nodeMap = ZFile::GetNodeMap(); - size_t childIndex = rawDataIndex; - resList.reserve(arrayCnt); - for (size_t i = 0; i < arrayCnt; i++) - { - ZResource* res = nodeMap->at(childName)(parent); - if (!res->DoesSupportArray()) - { - std::string errorHeader = StringHelper::Sprintf( - "resource <%s> does not support being wrapped in an ", childName.c_str()); - HANDLE_ERROR_RESOURCE(WarningType::InvalidXML, parent, this, rawDataIndex, errorHeader, - ""); - } - res->parent = parent; - res->SetInnerNode(true); - res->ExtractFromXML(child, childIndex); - - childIndex += res->GetRawDataSize(); - resList.push_back(res); - } -} - -Declaration* ZArray::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - ZResource* res = resList.at(0); - Declaration* decl; - if (res->IsExternalResource()) - { - auto filepath = Globals::Instance->outputPath / name; - std::string includePath = StringHelper::Sprintf("%s.%s.inc", filepath.c_str(), - res->GetExternalExtension().c_str()); - decl = parent->AddDeclarationIncludeArray(rawDataIndex, includePath, GetRawDataSize(), - GetSourceTypeName(), name, arrayCnt); - decl->text = bodyStr; - decl->isExternal = true; - } - else - { - decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), name, arrayCnt, bodyStr); - } - - decl->staticConf = staticConf; - return decl; -} - -std::string ZArray::GetBodySourceCode() const -{ - std::string output; - - for (size_t i = 0; i < arrayCnt; i++) - { - const auto& res = resList[i]; - output += "\t"; - - switch (res->GetResourceType()) - { - case ZResourceType::Pointer: - case ZResourceType::Scalar: - case ZResourceType::Vertex: - case ZResourceType::CollisionPoly: - case ZResourceType::SurfaceType: - output += resList.at(i)->GetBodySourceCode(); - break; - - default: - output += StringHelper::Sprintf("{ %s }", resList.at(i)->GetBodySourceCode().c_str()); - break; - } - - if (i < arrayCnt - 1 || res->IsExternalResource()) - output += ",\n"; - } - - return output; -} - -size_t ZArray::GetRawDataSize() const -{ - size_t size = 0; - for (const auto res : resList) - size += res->GetRawDataSize(); - return size; -} - -std::string ZArray::GetSourceTypeName() const -{ - return resList.at(0)->GetSourceTypeName(); -} - -ZResourceType ZArray::GetResourceType() const -{ - return ZResourceType::Array; -} - -DeclarationAlignment ZArray::GetDeclarationAlignment() const -{ - if (resList.size() == 0) - { - return DeclarationAlignment::Align4; - } - return resList.at(0)->GetDeclarationAlignment(); -} diff --git a/ZAPDTR/ZAPD/ZArray.h b/ZAPDTR/ZAPD/ZArray.h deleted file mode 100644 index e6594fadc..000000000 --- a/ZAPDTR/ZAPD/ZArray.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include -#include -#include -#include "ZResource.h" -#include "tinyxml2.h" - -class ZArray : public ZResource -{ -public: - ZArray(ZFile* nParent); - ~ZArray(); - - void ParseXML(tinyxml2::XMLElement* reader) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - DeclarationAlignment GetDeclarationAlignment() const override; - - size_t arrayCnt; - std::vector resList; -protected: - std::string childName; -}; diff --git a/ZAPDTR/ZAPD/ZAudio.cpp b/ZAPDTR/ZAPD/ZAudio.cpp deleted file mode 100644 index 9f2059271..000000000 --- a/ZAPDTR/ZAPD/ZAudio.cpp +++ /dev/null @@ -1,415 +0,0 @@ -#include "ZAudio.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Audio, ZAudio); - -ZAudio::ZAudio(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("SoundFontTableOffset"); - RegisterRequiredAttribute("SequenceTableOffset"); - RegisterRequiredAttribute("SampleBankTableOffset"); - RegisterRequiredAttribute("SequenceFontTableOffset"); -} - -void ZAudio::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - auto t = reader->Name(); - - auto child = reader->FirstChildElement(); - - while (child != nullptr) - { - if (std::string(child->Value()) == "Sequences") - { - auto seqChild = child->FirstChildElement(); - - while (seqChild != nullptr) - { - if (std::string(seqChild->Value()) == "Sequence") - { - seqNames.push_back(seqChild->Attribute("Name")); - } - - seqChild = seqChild->NextSiblingElement(); - } - } - - if (std::string(child->Value()) == "Samples") - { - int bankId = child->IntAttribute("Bank", 0); - auto sampChild = child->FirstChildElement(); - - while (sampChild != nullptr) - { - if (std::string(sampChild->Value()) == "Sample") - { - auto atStr = sampChild->FirstChildElement()->Attribute("At"); - auto loopStr = sampChild->FirstChildElement()->Attribute("LoopOffset"); - uint32_t loopOffset = 0xFFFFFFFF; - uint32_t atOffset = StringHelper::StrToL(atStr, 16); - - if (loopStr != NULL) - { - loopOffset = StringHelper::StrToL(loopStr, 16); - specialLoopSamples[loopOffset] = atOffset; - } - - sampleOffsets[bankId][loopOffset][atOffset] = sampChild->Attribute("Name"); - } - - sampChild = sampChild->NextSiblingElement(); - } - } - - if (std::string(child->Value()) == "Soundfont") - { - auto name = child->Attribute("Name"); - auto index = child->IntAttribute("Index", 0); - soundFontNames[index] = name; - } - - child = child->NextSiblingElement(); - } -} - -void ZAudio::DecodeADPCMSample(SampleEntry* sample) -{ - int16_t buffer[1024 * 128]; - - int16_t* out = &buffer[0]; -} - -std::vector ZAudio::ParseEnvelopeData(std::vector audioBank, std::vector audioTable, int envelopeOffset, int baseOffset) -{ - std::vector result; - - while (true) - { - AdsrEnvelope* env = new AdsrEnvelope(); - - env->delay = BitConverter::ToInt16BE(audioBank, envelopeOffset + 0); - env->arg = BitConverter::ToInt16BE(audioBank, envelopeOffset + 2); - - envelopeOffset += 4; - - result.push_back(env); - - if (env->delay < 0) - break; - } - - return result; -} - -SoundFontEntry* ZAudio::ParseSoundFontEntry(std::vector audioBank, - std::vector audioTable, - AudioTableEntry audioSampleBankEntry, int bankIndex, - int soundFontOffset, - int baseOffset) -{ - SoundFontEntry* soundFont = new SoundFontEntry(); - soundFont->sampleEntry = ParseSampleEntry( - audioBank, audioTable, audioSampleBankEntry, bankIndex, - BitConverter::ToInt32BE(audioBank, soundFontOffset + 0) + baseOffset, baseOffset); - soundFont->tuning = BitConverter::ToFloatBE(audioBank, soundFontOffset + 4); - - return soundFont; -} - -SampleEntry* ZAudio::ParseSampleEntry(std::vector audioBank, - std::vector audioTable, - AudioTableEntry audioSampleBankEntry, int bankIndex, - int sampleOffset, - int baseOffset) -{ - int sampleDataOffset = BitConverter::ToInt32BE(audioBank, sampleOffset + 4) + audioSampleBankEntry.ptr; - - if (samples.find(sampleOffset) == samples.end()) - { - SampleEntry* sample = new SampleEntry(); - - sample->bankId = bankIndex; - - int sampleSize = BitConverter::ToInt32BE(audioBank, sampleOffset + 0) & 0x00FFFFFF; - int loopOffset = BitConverter::ToInt32BE(audioBank, sampleOffset + 8) + baseOffset; - int bookOffset = BitConverter::ToInt32BE(audioBank, sampleOffset + 12) + baseOffset; - - char* sampleData = (char*)malloc(sampleSize); - memcpy(sampleData, audioTable.data() + sampleDataOffset, sampleSize); - sample->data = std::vector(sampleSize); - memcpy(sample->data.data(), sampleData, sampleSize); - - uint32_t origField = (BitConverter::ToUInt32BE(audioBank, sampleOffset + 0)); - sample->codec = (origField >> 28) & 0x0F; - sample->medium = (origField >> 24) & 0x03; - sample->unk_bit26 = (origField >> 22) & 0x01; - sample->unk_bit25 = (origField >> 21) & 0x01; - - sample->loop.start = BitConverter::ToInt32BE(audioBank, loopOffset + 0); - sample->loop.end = BitConverter::ToInt32BE(audioBank, loopOffset + 4); - sample->loop.count = BitConverter::ToInt32BE(audioBank, loopOffset + 8); - - if (sample->loop.count != 0) - { - for (int i = 0; i < 16; i++) - { - int16_t state = BitConverter::ToInt16BE(audioBank, loopOffset + 16 + (i * 2)); - sample->loop.states.push_back(state); - } - } - - sample->book.order = BitConverter::ToInt32BE(audioBank, bookOffset + 0); - sample->book.npredictors = BitConverter::ToInt32BE(audioBank, bookOffset + 4); - - for (int i = 0; i < sample->book.npredictors * sample->book.order * 8; i++) - { - sample->book.books.push_back( - BitConverter::ToInt16BE(audioBank, bookOffset + 8 + (i * 2))); - } - - sample->sampleDataOffset = sampleDataOffset; - - if (specialLoopSamples.find(loopOffset) != specialLoopSamples.end()) - sample->sampleLoopOffset = loopOffset; - - sample->fileName = StringHelper::Sprintf("audio/samples/sample_%08X", sampleOffset); - - samples[sampleOffset] = sample; - - return sample; - } - else - { - return samples[sampleOffset]; - } -} - -std::vector ZAudio::ParseAudioTable(std::vector codeData, int baseOffset) -{ - std::vector entries; - - int numEntries = BitConverter::ToInt16BE(codeData, baseOffset + 0); - int romAddr = BitConverter::ToInt16BE(codeData, baseOffset + 4); - - int currentOffset = baseOffset + 16; - - for (int i = 0; i < numEntries; i++) - { - AudioTableEntry entry; - - entry.ptr = BitConverter::ToInt32BE(codeData, currentOffset + 0); - entry.size = BitConverter::ToInt32BE(codeData, currentOffset + 4); - entry.medium = codeData[currentOffset + 8]; - entry.cachePolicy = codeData[currentOffset + 9]; - entry.data1 = BitConverter::ToInt16BE(codeData, currentOffset + 10); - entry.data2 = BitConverter::ToInt16BE(codeData, currentOffset + 12); - entry.data3 = BitConverter::ToInt16BE(codeData, currentOffset + 14); - - entries.push_back(entry); - - currentOffset += 16; - } - - return entries; -} - -void ZAudio::ParseSoundFont(std::vector codeData, std::vector audioTable, - std::vector audioSampleBank, - AudioTableEntry& entry) -{ - int ptr = entry.ptr; - int size = entry.size; - int sampleBankId1 = (entry.data1 >> 8) & 0xFF; - int sampleBankId2 = (entry.data1) & 0xFF; - int numInstruments = (entry.data2 >> 8) & 0xFF; - int numDrums = entry.data2 & 0xFF; - int numSfx = entry.data3; - - int currentOffset = BitConverter::ToInt32BE(codeData, ptr) + ptr; - for (int i = 0; i < numDrums; i++) - { - DrumEntry drum; - - int samplePtr = BitConverter::ToInt32BE(codeData, currentOffset); - - if (samplePtr != 0) - { - samplePtr += ptr; - - drum.sample = ParseSampleEntry(codeData, audioTable, audioSampleBank[sampleBankId1], sampleBankId1, - BitConverter::ToInt32BE(codeData, samplePtr + 4) + ptr, ptr); - - drum.releaseRate = codeData[samplePtr + 0]; - drum.pan = codeData[samplePtr + 1]; - drum.loaded = codeData[samplePtr + 2]; - drum.tuning = BitConverter::ToFloatBE(codeData, samplePtr + 8); - drum.env = ParseEnvelopeData(codeData, audioTable, BitConverter::ToInt32BE(codeData, samplePtr + 12) + ptr, ptr); - } - - entry.drums.push_back(drum); - - currentOffset += 4; - } - - currentOffset = BitConverter::ToInt32BE(codeData, ptr + 4) + ptr; - for (int i = 0; i < numSfx; i++) - { - SoundFontEntry* sfx; - sfx = ParseSoundFontEntry(codeData, audioTable, audioSampleBank[sampleBankId1], sampleBankId1, - currentOffset, ptr); - entry.soundEffects.push_back(sfx); - - currentOffset += 8; - } - - for (int i = 0; i < numInstruments; i++) - { - InstrumentEntry instrument; - - currentOffset = BitConverter::ToInt32BE(codeData, ptr + 8 + (i * 4)); - - instrument.isValidInstrument = currentOffset != 0; - - if (currentOffset != 0) - { - currentOffset += ptr; - - instrument.loaded = codeData[currentOffset + 0]; - instrument.normalRangeLo = codeData[currentOffset + 1]; - instrument.normalRangeHi = codeData[currentOffset + 2]; - instrument.releaseRate = codeData[currentOffset + 3]; - instrument.env = ParseEnvelopeData(codeData, audioTable, BitConverter::ToInt32BE(codeData, currentOffset + 4) + ptr, ptr); - - if (BitConverter::ToInt32BE(codeData, currentOffset + 8) != 0) - instrument.lowNotesSound = ParseSoundFontEntry( - codeData, audioTable, audioSampleBank[sampleBankId1], sampleBankId1, currentOffset + 8, ptr); - - if (BitConverter::ToInt32BE(codeData, currentOffset + 16) != 0) - instrument.normalNotesSound = ParseSoundFontEntry( - codeData, audioTable, audioSampleBank[sampleBankId1], sampleBankId1, currentOffset + 16, ptr); - - if (BitConverter::ToInt32BE(codeData, currentOffset + 24) != 0 && - instrument.normalRangeHi != 0x7F) - instrument.highNotesSound = ParseSoundFontEntry( - codeData, audioTable, audioSampleBank[sampleBankId1], sampleBankId1, currentOffset + 24, ptr); - } - - entry.instruments.push_back(instrument); - } -} - -void ZAudio::ParseRawData() -{ - ZResource::ParseRawData(); - - std::vector codeData; - std::vector audioTableData; - std::vector audioBankData; - std::vector audioSeqData; - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - codeData = Globals::Instance->GetBaseromFile("code"); - else - codeData = Globals::Instance->GetBaseromFile(Globals::Instance->baseRomPath.string() + "code"); - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - audioTableData = Globals::Instance->GetBaseromFile("Audiotable"); - else - audioTableData = Globals::Instance->GetBaseromFile(Globals::Instance->baseRomPath.string() + "Audiotable"); - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - audioBankData = Globals::Instance->GetBaseromFile("Audiobank"); - else - audioBankData = Globals::Instance->GetBaseromFile(Globals::Instance->baseRomPath.string() + "Audiobank"); - - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - audioSeqData = Globals::Instance->GetBaseromFile("Audioseq"); - else - audioSeqData = Globals::Instance->GetBaseromFile(Globals::Instance->baseRomPath.string() + - "Audioseq"); - - // TABLE PARSING - - // MQ DBG ROM - //int gSoundFontTableOffset = 0x138270; - //int gSequenceTableOffset = 0x1386A0; - //int gSampleBankTableOffset = 0x138D90; - //int gSequenceFontTableOffset = 0x1384E0; - - // NTSC 1.0 - //int gSoundFontTableOffset = 0x1026A0; - //int gSequenceTableOffset = 0x102AD0; - //int gSampleBankTableOffset = 0x1031C0; - //int gSequenceFontTableOffset = 0x102910; - - int gSoundFontTableOffset = StringHelper::StrToL(registeredAttributes.at("SoundFontTableOffset").value, 16); - int gSequenceTableOffset = StringHelper::StrToL(registeredAttributes.at("SequenceTableOffset").value, 16); - int gSampleBankTableOffset = StringHelper::StrToL(registeredAttributes.at("SampleBankTableOffset").value, 16); - int gSequenceFontTableOffset = StringHelper::StrToL(registeredAttributes.at("SequenceFontTableOffset").value, 16); - - soundFontTable = ParseAudioTable(codeData, gSoundFontTableOffset); - sequenceTable = ParseAudioTable(codeData, gSequenceTableOffset); - sampleBankTable = ParseAudioTable(codeData, gSampleBankTableOffset); - - // SEQEUNCE FONT TABLE PARSING - for (int i = 0; i < sequenceTable.size(); i++) - { - uint16_t idx = BitConverter::ToUInt16BE(codeData, gSequenceFontTableOffset + (i * 2)); - uint8_t numFonts = codeData[gSequenceFontTableOffset + (idx++)]; - std::vector fontIds; - - for (int j = 0; j < numFonts; j++) - { - uint8_t fontId = codeData[gSequenceFontTableOffset + (idx++)]; - fontIds.push_back(fontId); - } - - fontIndices.push_back(fontIds); - } - - - // SAMPLE/FONT PARSING - for (int i = 0; i < soundFontTable.size(); i++) - { - ParseSoundFont(audioBankData, audioTableData, sampleBankTable, soundFontTable[i]); - } - - // SEQUENCE PARSING - for (int i = 0; i < sequenceTable.size(); i++) - { - int seqDestIdx = i; - - if (sequenceTable[i].size == 0) - seqDestIdx = sequenceTable[i].ptr; - - std::vector seqVec = std::vector(sequenceTable[seqDestIdx].size); - memcpy(seqVec.data(), audioSeqData.data() + sequenceTable[seqDestIdx].ptr, - sequenceTable[seqDestIdx].size); - - sequences.push_back(seqVec); - } -} - -std::string ZAudio::GetSourceTypeName() const -{ - return "u8"; -} - -size_t ZAudio::GetRawDataSize() const -{ - return 1; -} - -ZResourceType ZAudio::GetResourceType() const -{ - return ZResourceType::Audio; -} diff --git a/ZAPDTR/ZAPD/ZAudio.h b/ZAPDTR/ZAPD/ZAudio.h deleted file mode 100644 index 286c75c11..000000000 --- a/ZAPDTR/ZAPD/ZAudio.h +++ /dev/null @@ -1,134 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "tinyxml2.h" - -struct AdsrEnvelope -{ - int16_t delay; - int16_t arg; -}; - -struct AdpcmBook -{ - /* 0x00 */ int32_t order; - /* 0x04 */ int32_t npredictors; - /* 0x08 */ std::vector books; // size 8 * order * npredictors. 8-byte aligned -}; - -struct AdpcmLoop -{ - /* 0x00 */ uint32_t start; - /* 0x04 */ uint32_t end; - /* 0x08 */ uint32_t count; - /* 0x10 */ std::vector states; -}; - -struct SampleEntry -{ - std::string fileName; - uint8_t bankId; - uint32_t sampleDataOffset; - uint32_t sampleLoopOffset = 0xFFFFFFFF; - uint8_t codec; - uint8_t medium; - uint8_t unk_bit26; - uint8_t unk_bit25; - - std::vector data; - AdpcmLoop loop; - AdpcmBook book; -}; - -struct SoundFontEntry -{ - SampleEntry* sampleEntry = nullptr; - float tuning; -}; - -struct DrumEntry -{ - uint8_t releaseRate; - uint8_t pan; - uint8_t loaded; - uint32_t offset; - float tuning; - std::vector env; - SampleEntry* sample = nullptr; -}; - -struct InstrumentEntry -{ - bool isValidInstrument; - uint8_t loaded; - uint8_t normalRangeLo; - uint8_t normalRangeHi; - uint8_t releaseRate; - std::vector env; - SoundFontEntry* lowNotesSound = nullptr; - SoundFontEntry* normalNotesSound = nullptr; - SoundFontEntry* highNotesSound = nullptr; -}; - -struct AudioTableEntry -{ - uint32_t ptr; - uint32_t size; - uint8_t medium; - uint8_t cachePolicy; - uint16_t data1; - uint16_t data2; - uint16_t data3; - - std::vector drums; - std::vector soundEffects; - std::vector instruments; -}; - -class ZAudio : public ZResource -{ -public: - std::vector soundFontTable; - std::vector sequenceTable; - std::vector sampleBankTable; - std::vector> sequences; - std::map samples; - std::vector> fontIndices; - std::vector seqNames; - std::map soundFontNames; - - // First Key = Bank ID, Sec Key = LoopDataOffset, Third Key = Sample Data Offset - std::map>> sampleOffsets; - - // Key = Loop Offset, Value = Sample Offset - std::map specialLoopSamples; - - ZAudio(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - - void DecodeADPCMSample(SampleEntry* sample); - std::vector ParseEnvelopeData(std::vector audioBank, std::vector audioTable, - int envelopeOffset, int baseOffset); - - SoundFontEntry* ParseSoundFontEntry(std::vector audioBank, - std::vector audioTable, - AudioTableEntry audioSampleBankEntry, int bankIndex, - int soundFontOffset, - int baseOffset); - - SampleEntry* ParseSampleEntry(std::vector audioBank, std::vector audioTable, - AudioTableEntry audioSampleBankEntry, int bankIndex, - int sampleOffset, int baseOffset); - - std::vector ParseAudioTable(std::vector codeData, int baseOffset); - void ParseSoundFont(std::vector codeData, std::vector audioTable, - std::vector audioSampleBank, AudioTableEntry& entry); - - void ParseRawData() override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZAudioDecode.cpp b/ZAPDTR/ZAPD/ZAudioDecode.cpp deleted file mode 100644 index 90ecfe35c..000000000 --- a/ZAPDTR/ZAPD/ZAudioDecode.cpp +++ /dev/null @@ -1,669 +0,0 @@ -/** - * Bruteforcing decoder for converting ADPCM-encoded AIFC into AIFF, in a way - * that roundtrips with vadpcm_enc. - */ -#include -#include -#include -#include -#include -#include -//#include - -typedef signed char s8; -typedef short s16; -typedef int s32; -typedef long long s64; -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; -typedef unsigned long long u64; -typedef float f32; -typedef double f64; - -#ifdef _MSC_VER -#define __builtin_bswap16 _byteswap_ushort -#define __builtin_bswap32 _byteswap_ulong -#endif - -#define bswap16(x) __builtin_bswap16(x) -#define bswap32(x) __builtin_bswap32(x) -#define BSWAP16(x) x = __builtin_bswap16(x) -#define BSWAP32(x) x = __builtin_bswap32(x) -#define BSWAP16_MANY(x, n) \ - for (s32 _i = 0; _i < n; _i++) \ - BSWAP16((x)[_i]) - -#define NORETURN __attribute__((noreturn)) -#define UNUSED __attribute__((unused)) - -typedef struct -{ - u32 ckID; - u32 ckSize; -} ChunkHeader; - -typedef struct -{ - u32 ckID; - u32 ckSize; - u32 formType; -} Chunk; - -typedef struct -{ - s16 numChannels; - u16 numFramesH; - u16 numFramesL; - s16 sampleSize; - s16 sampleRate[5]; // 80-bit float - u16 compressionTypeH; - u16 compressionTypeL; -} CommonChunk; - -typedef struct -{ - s16 MarkerID; - u16 positionH; - u16 positionL; -} Marker; - -typedef struct -{ - s16 playMode; - s16 beginLoop; - s16 endLoop; -} Loop; - -typedef struct -{ - s8 baseNote; - s8 detune; - s8 lowNote; - s8 highNote; - s8 lowVelocity; - s8 highVelocity; - s16 gain; - Loop sustainLoop; - Loop releaseLoop; -} InstrumentChunk; - -typedef struct -{ - s32 offset; - s32 blockSize; -} SoundDataChunk; - -typedef struct -{ - s16 version; - s16 order; - s16 nEntries; -} CodeChunk; - -typedef struct -{ - u32 start; - u32 end; - u32 count; - s16 state[16]; -} ALADPCMloop; - -static char usage[] = "input.aifc output.aiff"; -static const char *progname, *infilename; -static int framesize = 9; - -void fail_parse(const char* fmt, ...) -{ - char* formatted = NULL; - va_list ap; - va_start(ap, fmt); - int size = vsnprintf(NULL, 0, fmt, ap); - va_end(ap); - if (size >= 0) - { - size++; - formatted = (char*)malloc(size); - if (formatted != NULL) - { - va_start(ap, fmt); - size = vsnprintf(formatted, size, fmt, ap); - va_end(ap); - if (size < 0) - { - free(formatted); - formatted = NULL; - } - } - } - - if (formatted != NULL) - { - fprintf(stderr, "%s: %s [%s]\n", progname, formatted, infilename); - free(formatted); - } - exit(1); -} - - -s32 myrand() -{ - static u64 state = 1619236481962341ULL; - state *= 3123692312237ULL; - state += 1; - return state >> 33; -} - -s16 qsample(f32 x, s32 scale) -{ - if (x > 0.0f) - { - return (s16)((x / scale) + 0.4999999); - } - else - { - return (s16)((x / scale) - 0.4999999); - } -} - -void clamp_to_s16(f32* in, s32* out) -{ - f32 llevel = -0x8000; - f32 ulevel = 0x7fff; - - for (s32 i = 0; i < 16; i++) - { - if (in[i] > ulevel) - in[i] = ulevel; - if (in[i] < llevel) - in[i] = llevel; - - if (in[i] > 0.0f) - { - out[i] = (s32)(in[i] + 0.5); - } - else - { - out[i] = (s32)(in[i] - 0.5); - } - } -} - -s16 clamp_bits(s32 x, s32 bits) -{ - s32 lim = 1 << (bits - 1); - if (x < -lim) - return -lim; - if (x > lim - 1) - return lim - 1; - return x; -} - -s32 readaifccodebook(FILE* fhandle, s32**** table, s16* order, s16* npredictors) -{ - BSWAP16(*order); - BSWAP16(*npredictors); - *table = (s32***)malloc(*npredictors * sizeof(s32**)); - for (s32 i = 0; i < *npredictors; i++) - { - (*table)[i] = (s32**)malloc(8 * sizeof(s32*)); - for (s32 j = 0; j < 8; j++) - { - (*table)[i][j] = (s32*)malloc((*order + 8) * sizeof(s32)); - } - } - - for (s32 i = 0; i < *npredictors; i++) - { - s32** table_entry = (*table)[i]; - for (s32 j = 0; j < *order; j++) - { - for (s32 k = 0; k < 8; k++) - { - s16 ts = 0; - BSWAP16(ts); - table_entry[k][j] = ts; - } - } - - for (s32 k = 1; k < 8; k++) - { - table_entry[k][*order] = table_entry[k - 1][*order - 1]; - } - - table_entry[0][*order] = 1 << 11; - - for (s32 k = 1; k < 8; k++) - { - s32 j = 0; - for (; j < k; j++) - { - table_entry[j][k + *order] = 0; - } - - for (; j < 8; j++) - { - table_entry[j][k + *order] = table_entry[j - k][*order]; - } - } - } - return 0; -} - -ALADPCMloop* readlooppoints(FILE* ifile, s16* nloops) -{ - BSWAP16(*nloops); - ALADPCMloop* al = (ALADPCMloop*)malloc(*nloops * sizeof(ALADPCMloop)); - for (s32 i = 0; i < *nloops; i++) - { - BSWAP32(al[i].start); - BSWAP32(al[i].end); - BSWAP32(al[i].count); - BSWAP16_MANY(al[i].state, 16); - } - return al; -} - -s32 inner_product(s32 length, s32* v1, s32* v2) -{ - s32 out = 0; - for (s32 i = 0; i < length; i++) - { - out += v1[i] * v2[i]; - } - - // Compute "out / 2^11", rounded down. - s32 dout = out / (1 << 11); - s32 fiout = dout * (1 << 11); - return dout - (out - fiout < 0); -} - -void my_decodeframe(u8* frame, s32* decompressed, s32* state, s32 order, s32*** coefTable) -{ - s32 ix[16]; - - u8 header = frame[0]; - s32 scale = 1 << (header >> 4); - s32 optimalp = header & 0xf; - - if (framesize == 5) - { - for (s32 i = 0; i < 16; i += 4) - { - u8 c = frame[1 + i / 4]; - ix[i] = c >> 6; - ix[i + 1] = (c >> 4) & 0x3; - ix[i + 2] = (c >> 2) & 0x3; - ix[i + 3] = c & 0x3; - } - } - else - { - for (s32 i = 0; i < 16; i += 2) - { - u8 c = frame[1 + i / 2]; - ix[i] = c >> 4; - ix[i + 1] = c & 0xf; - } - } - - for (s32 i = 0; i < 16; i++) - { - if (framesize == 5) - { - if (ix[i] >= 2) - ix[i] -= 4; - } - else - { - if (ix[i] >= 8) - ix[i] -= 16; - } - decompressed[i] = ix[i]; - ix[i] *= scale; - } - - for (s32 j = 0; j < 2; j++) - { - s32 in_vec[16]; - if (j == 0) - { - for (s32 i = 0; i < order; i++) - { - in_vec[i] = state[16 - order + i]; - } - } - else - { - for (s32 i = 0; i < order; i++) - { - in_vec[i] = state[8 - order + i]; - } - } - - for (s32 i = 0; i < 8; i++) - { - s32 ind = j * 8 + i; - in_vec[order + i] = ix[ind]; - state[ind] = inner_product(order + i, coefTable[optimalp][i], in_vec) + ix[ind]; - } - } -} - -void get_bounds(s32* in, s32* decompressed, s32 scale, s32* minVals, s32* maxVals) -{ - s32 minv, maxv; - if (framesize == 9) - { - minv = -8; - maxv = 7; - } - else - { - minv = -2; - maxv = 1; - } - for (s32 i = 0; i < 16; i++) - { - s32 lo = in[i] - scale / 2; - s32 hi = in[i] + scale / 2; - lo -= scale; - hi += scale; - if (decompressed[i] == minv) - lo -= scale; - else if (decompressed[i] == maxv) - hi += scale; - minVals[i] = lo; - maxVals[i] = hi; - } -} - -void write_header(FILE* ofile, const char* id, s32 size) -{ - fwrite(id, 4, 1, ofile); - BSWAP32(size); - fwrite(&size, sizeof(s32), 1, ofile); -} - -char* OldMain(char* infilename) -{ - s16 order = -1; - s16 nloops = 0; - ALADPCMloop* aloops = NULL; - s16 npredictors = -1; - s32*** coefTable = NULL; - s32 state[16]; - s32 decompressed[16]; - s32 soundPointer = -1; - s32 currPos = 0; - s32 nSamples = 0; - Chunk FormChunk = Chunk(); - ChunkHeader Header = ChunkHeader(); - CommonChunk CommChunk = CommonChunk(); - InstrumentChunk InstChunk; - SoundDataChunk SndDChunk = SoundDataChunk(); - FILE* ifile = NULL; - FILE* ofile = NULL; - - if ((ifile = fopen(infilename, "rb")) == NULL) - { - fail_parse("AIFF-C file could not be opened"); - exit(1); - } - - memset(&InstChunk, 0, sizeof(InstChunk)); - - BSWAP32(FormChunk.ckID); - BSWAP32(FormChunk.formType); - if ((FormChunk.ckID != 0x464f524d) || (FormChunk.formType != 0x41494643)) - { // FORM, AIFC - fail_parse("not an AIFF-C file"); - } - - for (;;) - { - s32 num = fread(&Header, sizeof(Header), 1, ifile); - u32 ts = 0; - - if (num <= 0) - break; - - BSWAP32(Header.ckID); - BSWAP32(Header.ckSize); - - Header.ckSize++; - Header.ckSize &= ~1; - s32 offset = ftell(ifile); - - switch (Header.ckID) - { - case 0x434f4d4d: // COMM - { - BSWAP16(CommChunk.numChannels); - BSWAP16(CommChunk.numFramesH); - BSWAP16(CommChunk.numFramesL); - BSWAP16(CommChunk.sampleSize); - BSWAP16(CommChunk.compressionTypeH); - BSWAP16(CommChunk.compressionTypeL); - s32 cType = (CommChunk.compressionTypeH << 16) + CommChunk.compressionTypeL; - if (cType == 0x56415043 || cType == 0x41445039) - { // VAPC or ADP9 - framesize = 9; - } - else if (cType == 0x41445035) - { // ADP5 - framesize = 5; - } - else if (cType == 0x4850434d) - { // HPCM - framesize = 16; - } - else - { - char comprType[5] = { - static_cast(CommChunk.compressionTypeH >> 8), static_cast(CommChunk.compressionTypeH & 0xFF), - static_cast(CommChunk.compressionTypeL >> 8), static_cast(CommChunk.compressionTypeL & 0xFF), 0}; - fail_parse("file is of the wrong compression type [got %s (%08x)]", &comprType, - cType); - } - if (CommChunk.numChannels != 1) - { - fail_parse("file contains %d channels, only 1 channel supported", - CommChunk.numChannels); - } - if (CommChunk.sampleSize != 16) - { - fail_parse("file contains %d bit samples, only 16 bit samples supported", - CommChunk.sampleSize); - } - - nSamples = (CommChunk.numFramesH << 16) + CommChunk.numFramesL; - - // Allow broken input lengths - if (nSamples % 16) - { - nSamples -= (nSamples % 16); - } - - if (nSamples % 16 != 0) - { - fail_parse("number of chunks must be a multiple of 16, found %d with remainder %d", - nSamples, nSamples % 16); - } - } - break; - - case 0x53534e44: // SSND - BSWAP32(SndDChunk.offset); - BSWAP32(SndDChunk.blockSize); - assert(SndDChunk.offset == 0); - assert(SndDChunk.blockSize == 0); - soundPointer = ftell(ifile); - break; - - case 0x4150504c: // APPL - BSWAP32(ts); - if (ts == 0x73746f63) - { // stoc - u8 len = 0; - if (len == 11) - { - char ChunkName[12]; - s16 version; - ChunkName[11] = '\0'; - if (strcmp("VADPCMCODES", ChunkName) == 0) - { - BSWAP16(version); - if (version != 1) - { - fail_parse("Unknown codebook chunk version"); - } - readaifccodebook(ifile, &coefTable, &order, &npredictors); - } - else if (strcmp("VADPCMLOOPS", ChunkName) == 0) - { - BSWAP16(version); - if (version != 1) - { - fail_parse("Unknown loop chunk version"); - } - aloops = readlooppoints(ifile, &nloops); - if (nloops != 1) - { - fail_parse("Only a single loop supported"); - } - } - } - } - break; - } - - fseek(ifile, offset + Header.ckSize, SEEK_SET); - } - - if (coefTable == NULL) - { - fail_parse("Codebook missing from bitstream"); - } - - for (s32 i = 0; i < order; i++) - { - state[15 - i] = 0; - } - - u32 outputBytes = nSamples * sizeof(s16); - u8* outputBuf = (u8*)malloc(outputBytes); - - fseek(ifile, soundPointer, SEEK_SET); - s32 fails = 0; - while (currPos < nSamples) - { - u8 input[9]; - u8 encoded[9]; - s32 lastState[16]; - s32 decoded[16]; - s16 guess[16]; - s16 origGuess[16]; - - memcpy(lastState, state, sizeof(state)); - - // Decode for real - my_decodeframe(input, decompressed, state, order, coefTable); - memcpy(decoded, state, sizeof(state)); - - // Create a guess from that, by clamping to 16 bits - for (s32 i = 0; i < 16; i++) - { - origGuess[i] = clamp_bits(state[i], 16); - } - - memcpy(state, decoded, sizeof(state)); - memcpy(outputBuf + currPos * 2, decoded, sizeof(decoded)); - currPos += 16; - } - if (fails) - { - fprintf(stderr, "%s %d\n", infilename, fails); - } - - // Write an incomplete file header. We'll fill in the size later. - fwrite("FORM\0\0\0\0AIFF", 12, 1, ofile); - - // Subtract 4 from the COMM size to skip the compression field. - write_header(ofile, "COMM", sizeof(CommonChunk) - 4); - CommChunk.numFramesH = nSamples >> 16; - CommChunk.numFramesL = nSamples & 0xffff; - BSWAP16(CommChunk.numChannels); - BSWAP16(CommChunk.numFramesH); - BSWAP16(CommChunk.numFramesL); - BSWAP16(CommChunk.sampleSize); - fwrite(&CommChunk, sizeof(CommonChunk) - 4, 1, ofile); - - if (nloops > 0) - { - s32 startPos = aloops[0].start, endPos = aloops[0].end; - const char* markerNames[2] = {"start", "end"}; - Marker markers[2] = {{1, static_cast(startPos >> 16), static_cast(startPos & 0xffff)}, - {2, static_cast(endPos >> 16), static_cast(endPos & 0xffff)}}; - write_header(ofile, "MARK", 2 + 2 * sizeof(Marker) + 1 + 5 + 1 + 3); - s16 numMarkers = bswap16(2); - fwrite(&numMarkers, sizeof(s16), 1, ofile); - for (s32 i = 0; i < 2; i++) - { - u8 len = (u8)strlen(markerNames[i]); - BSWAP16(markers[i].MarkerID); - BSWAP16(markers[i].positionH); - BSWAP16(markers[i].positionL); - fwrite(&markers[i], sizeof(Marker), 1, ofile); - fwrite(&len, 1, 1, ofile); - fwrite(markerNames[i], len, 1, ofile); - } - - write_header(ofile, "INST", sizeof(InstrumentChunk)); - InstChunk.sustainLoop.playMode = bswap16(1); - InstChunk.sustainLoop.beginLoop = bswap16(1); - InstChunk.sustainLoop.endLoop = bswap16(2); - InstChunk.releaseLoop.playMode = 0; - InstChunk.releaseLoop.beginLoop = 0; - InstChunk.releaseLoop.endLoop = 0; - fwrite(&InstChunk, sizeof(InstrumentChunk), 1, ofile); - } - - // Save the coefficient table for use when encoding. Ideally this wouldn't - // be needed and "tabledesign -s 1" would generate the right table, but in - // practice it's difficult to adjust samples to make that happen. - write_header(ofile, "APPL", 4 + 12 + sizeof(CodeChunk) + npredictors * order * 8 * 2); - fwrite("stoc", 4, 1, ofile); - CodeChunk cChunk; - cChunk.version = bswap16(1); - cChunk.order = bswap16(order); - cChunk.nEntries = bswap16(npredictors); - fwrite("\x0bVADPCMCODES", 12, 1, ofile); - fwrite(&cChunk, sizeof(CodeChunk), 1, ofile); - for (s32 i = 0; i < npredictors; i++) - { - for (s32 j = 0; j < order; j++) - { - for (s32 k = 0; k < 8; k++) - { - s16 ts = bswap16(coefTable[i][k][j]); - fwrite(&ts, sizeof(s16), 1, ofile); - } - } - } - - write_header(ofile, "SSND", outputBytes + 8); - SndDChunk.offset = 0; - SndDChunk.blockSize = 0; - fwrite(&SndDChunk, sizeof(SoundDataChunk), 1, ofile); - fwrite(outputBuf, outputBytes, 1, ofile); - - // Fix the size in the header - s32 fileSize = bswap32(ftell(ofile) - 8); - fseek(ofile, 4, SEEK_SET); - fwrite(&fileSize, 4, 1, ofile); - - fclose(ifile); - fclose(ofile); - return 0; -} diff --git a/ZAPDTR/ZAPD/ZBackground.cpp b/ZAPDTR/ZAPD/ZBackground.cpp deleted file mode 100644 index 026002da1..000000000 --- a/ZAPDTR/ZAPD/ZBackground.cpp +++ /dev/null @@ -1,195 +0,0 @@ -#include "ZBackground.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Background, ZBackground); - -#define JPEG_MARKER 0xFFD8FFE0 -#define MARKER_DQT 0xFFDB -#define MARKER_EOI 0xFFD9 - -ZBackground::ZBackground(ZFile* nParent) : ZResource(nParent) -{ -} - -void ZBackground::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - size_t i = 0; - while (true) - { - uint8_t val = rawData.at(rawDataIndex + i); - data.push_back(val); - - if (BitConverter::ToUInt16BE(rawData, rawDataIndex + i) == MARKER_EOI) - { - data.push_back(rawData.at(rawDataIndex + i + 1)); - break; - } - - i++; - } -} - -void ZBackground::ParseBinaryFile(const std::string& inFolder, bool appendOutName) -{ - fs::path filepath(inFolder); - - if (appendOutName) - filepath = filepath / (outName + "." + GetExternalExtension()); - - data = DiskFile::ReadAllBytes(filepath.string()); - - // Add padding. - data.insert(data.end(), GetRawDataSize() - data.size(), 0x00); - CheckValidJpeg(filepath.generic_string()); -} - -void ZBackground::CheckValidJpeg(const std::string& filepath) -{ - std::string filename = outName; - if (filepath != "") - { - filename = filepath; - } - - uint32_t jpegMarker = BitConverter::ToUInt32BE(data, 0); - if (jpegMarker != JPEG_MARKER) - { - HANDLE_WARNING_PROCESS( - WarningType::InvalidJPEG, - StringHelper::Sprintf("missing jpeg marker at beginning of file: '%s'", - filename.c_str()), - "The game will skip this jpeg."); - } - if (data.at(6) != 'J' || data.at(7) != 'F' || data.at(8) != 'I' || data.at(9) != 'F' || - data.at(10) != '\0') - { - std::string jfifIdentifier(data.begin() + 6, data.begin() + 6 + 5); - HANDLE_WARNING_PROCESS( - WarningType::InvalidJPEG, "missing 'JFIF' identifier", - StringHelper::Sprintf( - "This image may be corrupted, or not a jpeg. The identifier found was: '%s'", - jfifIdentifier.c_str())); - } - uint8_t majorVersion = data.at(11); - uint8_t minorVersion = data.at(12); - if (majorVersion != 0x01 || minorVersion != 0x01) - { - HANDLE_WARNING_PROCESS( - WarningType::InvalidJPEG, - StringHelper::Sprintf("wrong JFIF version '%i.%02i'", majorVersion, minorVersion), - "The expected version is '1.01'. The game may be unable to decode this image " - "correctly."); - } - if (BitConverter::ToUInt16BE(data, 20) != MARKER_DQT) - { - // This may happen when creating a custom image with Exif, XMP, thumbnail, progressive, etc. - // enabled. - HANDLE_WARNING_PROCESS(WarningType::InvalidJPEG, - "there seems to be extra data before the image data in this file", - "The game may not be able to decode this image correctly."); - } - if (data.size() > GetRawDataSize()) - { - HANDLE_WARNING_PROCESS( - WarningType::InvalidJPEG, "the image is bigger than the screen buffer", - StringHelper::Sprintf("Image size: %zu bytes\nScreen buffer size: %zu bytes", - data.size(), GetRawDataSize())); - } -} - -size_t ZBackground::GetRawDataSize() const -{ - // Jpgs use the whole sceen buffer, which is a u16 matrix. - return Globals::Instance->cfg.bgScreenHeight * Globals::Instance->cfg.bgScreenWidth * 2; -} - -Declaration* ZBackground::DeclareVar(const std::string& prefix, - [[maybe_unused]] const std::string& bodyStr) -{ - std::string auxName = name; - std::string auxOutName = outName; - - if (auxName == "") - auxName = GetDefaultName(prefix); - - if (auxOutName == "") - auxOutName = GetDefaultName(prefix); - - auto filepath = Globals::Instance->outputPath / fs::path(auxOutName).stem(); - - std::string incStr = - StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(), GetExternalExtension().c_str()); - - Declaration* decl = parent->AddDeclarationIncludeArray(rawDataIndex, incStr, GetRawDataSize(), - GetSourceTypeName(), auxName, 0); - decl->arrayItemCntStr = "SCREEN_WIDTH * SCREEN_HEIGHT / 4"; - decl->forceArrayCnt = true; - decl->staticConf = staticConf; - return decl; -} - -bool ZBackground::IsExternalResource() const -{ - return true; -} - -std::string ZBackground::GetExternalExtension() const -{ - return "jpg"; -} - -void ZBackground::Save(const fs::path& outFolder) -{ - if (!Globals::Instance->otrMode) - { - fs::path filepath = outFolder / (outName + "." + GetExternalExtension()); - DiskFile::WriteAllBytes(filepath.string(), data); - } -} - -std::string ZBackground::GetBodySourceCode() const -{ - std::string bodyStr = " "; - - for (size_t i = 0; i < data.size() / 8; ++i) - { - bodyStr += StringHelper::Sprintf("0x%016llX, ", BitConverter::ToUInt64BE(data, i * 8)); - - if (i % 8 == 7) - bodyStr += "\n "; - } - - bodyStr += "\n"; - - return bodyStr; -} - -std::string ZBackground::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sBackground_%06X", prefix.c_str(), rawDataIndex); -} - -std::string ZBackground::GetSourceTypeName() const -{ - return "u64"; -} - -ZResourceType ZBackground::GetResourceType() const -{ - return ZResourceType::Background; -} - -DeclarationAlignment ZBackground::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align8; -} diff --git a/ZAPDTR/ZAPD/ZBackground.h b/ZAPDTR/ZAPD/ZBackground.h deleted file mode 100644 index e3728bd98..000000000 --- a/ZAPDTR/ZAPD/ZBackground.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include -#include -#include "ZResource.h" - -class ZBackground : public ZResource -{ -protected: - std::vector data; - -public: - ZBackground(ZFile* nParent); - - void ParseBinaryFile(const std::string& inFolder, bool appendOutName); - - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - void Save(const fs::path& outFolder) override; - - bool IsExternalResource() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - std::string GetExternalExtension() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - - void CheckValidJpeg(const std::string& filepath); -}; diff --git a/ZAPDTR/ZAPD/ZBlob.cpp b/ZAPDTR/ZAPD/ZBlob.cpp deleted file mode 100644 index 0965d7e4e..000000000 --- a/ZAPDTR/ZAPD/ZBlob.cpp +++ /dev/null @@ -1,116 +0,0 @@ -#include "ZBlob.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Blob, ZBlob); - -ZBlob::ZBlob(ZFile* nParent) : ZResource(nParent) -{ - genOTRDef = true; - RegisterRequiredAttribute("Size"); -} - -ZBlob* ZBlob::FromFile(const std::string& filePath) -{ - ZBlob* blob = new ZBlob(nullptr); - blob->name = StringHelper::Split(Path::GetFileNameWithoutExtension(filePath), ".")[0]; - blob->blobData = DiskFile::ReadAllBytes(filePath); - - return blob; -} - -void ZBlob::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - blobSize = StringHelper::StrToL(registeredAttributes.at("Size").value, 16); -} - -void ZBlob::ParseRawData() -{ - blobData.assign(parent->GetRawData().begin() + rawDataIndex, - parent->GetRawData().begin() + rawDataIndex + blobSize); -} - -Declaration* ZBlob::DeclareVar(const std::string& prefix, - [[maybe_unused]] const std::string& bodyStr) -{ - std::string auxName = name; - std::string auxOutName = outName; - - if (auxName == "") - auxName = GetDefaultName(prefix); - - if (auxOutName == "") - auxOutName = GetDefaultName(prefix); - - std::string path = Path::GetFileNameWithoutExtension(auxOutName); - - std::string assetOutDir = - (Globals::Instance->outputPath / Path::GetFileNameWithoutExtension(GetOutName())).string(); - - std::string incStr = - StringHelper::Sprintf("%s.%s.inc.c", assetOutDir.c_str(), GetExternalExtension().c_str()); - - return parent->AddDeclarationIncludeArray(rawDataIndex, incStr, GetRawDataSize(), - GetSourceTypeName(), auxName, blobData.size()); -} - -std::string ZBlob::GetBodySourceCode() const -{ - std::string sourceOutput; - - for (size_t i = 0; i < blobData.size(); i += 1) - { - if (i % 16 == 0) - sourceOutput += "\t"; - - sourceOutput += StringHelper::Sprintf("0x%02X, ", blobData[i]); - - if (i % 16 == 15) - sourceOutput += "\n"; - } - - // Ensure there's always a trailing line feed to prevent dumb warnings. - // Please don't remove this line, unless you somehow made a way to prevent - // that warning when building the OoT repo. - sourceOutput += "\n"; - - return sourceOutput; -} - -void ZBlob::Save(const fs::path& outFolder) -{ - if (!Globals::Instance->otrMode) - DiskFile::WriteAllBytes((outFolder / (name + ".bin")).string(), blobData); -} - -bool ZBlob::IsExternalResource() const -{ - return true; -} - -std::string ZBlob::GetExternalExtension() const -{ - return "bin"; -} - -std::string ZBlob::GetSourceTypeName() const -{ - return "u8"; -} - -ZResourceType ZBlob::GetResourceType() const -{ - return ZResourceType::Blob; -} - -size_t ZBlob::GetRawDataSize() const -{ - return blobSize; -} diff --git a/ZAPDTR/ZAPD/ZBlob.h b/ZAPDTR/ZAPD/ZBlob.h deleted file mode 100644 index d7a7feff1..000000000 --- a/ZAPDTR/ZAPD/ZBlob.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "tinyxml2.h" - -class ZBlob : public ZResource -{ -public: - ZBlob(ZFile* nParent); - - static ZBlob* FromFile(const std::string& filePath); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - void Save(const fs::path& outFolder) override; - - bool IsExternalResource() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - std::string GetExternalExtension() const override; - - size_t GetRawDataSize() const override; - -protected: - std::vector blobData; - size_t blobSize = 0; -}; diff --git a/ZAPDTR/ZAPD/ZCollision.cpp b/ZAPDTR/ZAPD/ZCollision.cpp deleted file mode 100644 index e75cfe2aa..000000000 --- a/ZAPDTR/ZAPD/ZCollision.cpp +++ /dev/null @@ -1,400 +0,0 @@ -#include "ZCollision.h" - -#include -#include -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -REGISTER_ZFILENODE(Collision, ZCollisionHeader); - -ZCollisionHeader::ZCollisionHeader(ZFile* nParent) : ZResource(nParent) -{ - genOTRDef = true; -} - -ZCollisionHeader::~ZCollisionHeader() -{ - delete camData; -} - -void ZCollisionHeader::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - absMinX = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - absMinY = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - absMinZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - - absMaxX = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - absMaxY = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); - absMaxZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); - - numVerts = BitConverter::ToUInt16BE(rawData, rawDataIndex + 12); - vtxAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 16); - - numPolygons = BitConverter::ToUInt16BE(rawData, rawDataIndex + 20); - polyAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 24); - polyTypeDefAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 28); - camDataAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 32); - - numWaterBoxes = BitConverter::ToUInt16BE(rawData, rawDataIndex + 36); - waterBoxAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 40); - - vtxSegmentOffset = Seg2Filespace(vtxAddress, parent->baseAddress); - polySegmentOffset = Seg2Filespace(polyAddress, parent->baseAddress); - polyTypeDefSegmentOffset = Seg2Filespace(polyTypeDefAddress, parent->baseAddress); - camDataSegmentOffset = Seg2Filespace(camDataAddress, parent->baseAddress); - waterBoxSegmentOffset = Seg2Filespace(waterBoxAddress, parent->baseAddress); - - vertices.reserve(numVerts); - polygons.reserve(numPolygons); - - offset_t currentPtr = vtxSegmentOffset; - - for (uint16_t i = 0; i < numVerts; i++) - { - ZVector vec(parent); - vec.ExtractFromBinary(currentPtr, ZScalarType::ZSCALAR_S16, 3); - - currentPtr += vec.GetRawDataSize(); - vertices.push_back(vec); - } - - for (uint16_t i = 0; i < numPolygons; i++) - { - ZCollisionPoly poly(parent); - poly.SetRawDataIndex(polySegmentOffset + (i * 16)); - poly.ParseRawData(); - polygons.push_back(poly); - } - - uint16_t highestPolyType = 0; - - for (const ZCollisionPoly& poly : polygons) - { - if (poly.type > highestPolyType) - highestPolyType = poly.type; - } - - for (uint16_t i = 0; i < highestPolyType + 1; i++) - { - ZSurfaceType surfaceType(parent); - surfaceType.SetRawDataIndex(polyTypeDefSegmentOffset + (i * 8)); - surfaceType.ParseRawData(); - PolygonTypes.push_back(surfaceType); - } - // polygonTypes.push_back( - // BitConverter::ToUInt64BE(rawData, polyTypeDefSegmentOffset + (i * 8))); - - if (camDataAddress != SEGMENTED_NULL) - { - // Try to guess how many elements the CamDataList array has. - // The "guessing algorithm" is basically a "best effort" one and it - // is error-prone. - // This is based mostly on observation of how CollisionHeader data is - // usually ordered. If for some reason the data was in some other funny - // order, this would probably break. - // The most common ordering is: - // - *CamData* - // - SurfaceType - // - CollisionPoly - // - Vertices - // - WaterBoxes - // - CollisionHeader - offset_t upperCameraBoundary = polyTypeDefSegmentOffset; - if (upperCameraBoundary == 0) - { - upperCameraBoundary = polySegmentOffset; - } - if (upperCameraBoundary == 0) - { - upperCameraBoundary = vtxSegmentOffset; - } - if (upperCameraBoundary == 0) - { - upperCameraBoundary = waterBoxSegmentOffset; - } - if (upperCameraBoundary == 0) - { - upperCameraBoundary = rawDataIndex; - } - - camData = - new CameraDataList(parent, name, rawData, camDataSegmentOffset, upperCameraBoundary); - } - - for (uint16_t i = 0; i < numWaterBoxes; i++) - waterBoxes.push_back(WaterBoxHeader( - rawData, - waterBoxSegmentOffset + (i * (Globals::Instance->game == ZGame::OOT_SW97 ? 12 : 16)))); -} - -void ZCollisionHeader::DeclareReferences(const std::string& prefix) -{ - std::string declaration = ""; - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - if (waterBoxes.size() > 0) - { - if (!Globals::Instance->otrMode) - { - for (size_t i = 0; i < waterBoxes.size(); i++) - { - declaration += - StringHelper::Sprintf("\t{ %s },", waterBoxes[i].GetBodySourceCode().c_str()); - if (i + 1 < waterBoxes.size()) - declaration += "\n"; - } - } - - parent->AddDeclarationArray( - waterBoxSegmentOffset, DeclarationAlignment::Align4, 16 * waterBoxes.size(), "WaterBox", - StringHelper::Sprintf("%sWaterBoxes", auxName.c_str()), waterBoxes.size(), declaration); - } - - if (polygons.size() > 0) - { - declaration.clear(); - - if (!Globals::Instance->otrMode) - { - for (size_t i = 0; i < polygons.size(); i++) - { - declaration += - StringHelper::Sprintf("\t%s,", polygons[i].GetBodySourceCode().c_str()); - if (i + 1 < polygons.size()) - declaration += "\n"; - } - } - - parent->AddDeclarationArray(polySegmentOffset, DeclarationAlignment::Align4, - polygons.size() * 16, polygons[0].GetSourceTypeName().c_str(), - StringHelper::Sprintf("%sPolygons", auxName.c_str()), - polygons.size(), declaration); - } - - declaration.clear(); - for (const auto& polyType : PolygonTypes) - { - declaration += StringHelper::Sprintf("\t%s,", polyType.GetBodySourceCode().c_str()); - } - - if (polyTypeDefAddress != SEGMENTED_NULL) - parent->AddDeclarationArray(polyTypeDefSegmentOffset, DeclarationAlignment::Align4, - PolygonTypes.size() * 8, - PolygonTypes[0].GetSourceTypeName().c_str(), - StringHelper::Sprintf("%sSurfaceType", auxName.c_str()), - PolygonTypes.size(), declaration); - - declaration.clear(); - - if (vertices.size() > 0) - { - declaration.clear(); - - if (!Globals::Instance->otrMode) - { - for (size_t i = 0; i < vertices.size(); i++) - { - declaration += - StringHelper::Sprintf("\t{ %s },", vertices[i].GetBodySourceCode().c_str()); - - if (i < vertices.size() - 1) - declaration += "\n"; - } - } - - const auto& first = vertices.front(); - if (vtxAddress != 0) - parent->AddDeclarationArray( - vtxSegmentOffset, first.GetDeclarationAlignment(), - vertices.size() * first.GetRawDataSize(), first.GetSourceTypeName(), - StringHelper::Sprintf("%sVertices", auxName.c_str()), vertices.size(), declaration); - } -} - -std::string ZCollisionHeader::GetBodySourceCode() const -{ - std::string declaration = ""; - - if (Globals::Instance->otrMode) - return declaration; - - declaration += "\n"; - - declaration += StringHelper::Sprintf("\t{ %i, %i, %i },\n", absMinX, absMinY, absMinZ); - declaration += StringHelper::Sprintf("\t{ %i, %i, %i },\n", absMaxX, absMaxY, absMaxZ); - - std::string vtxName; - Globals::Instance->GetSegmentedPtrName(vtxAddress, parent, "Vec3s", vtxName, parent->workerID); - declaration += StringHelper::Sprintf("\t%i,\n\t%s,\n", numVerts, vtxName.c_str()); - - std::string polyName; - Globals::Instance->GetSegmentedPtrName(polyAddress, parent, "CollisionPoly", polyName, - parent->workerID); - declaration += StringHelper::Sprintf("\t%i,\n\t%s,\n", numPolygons, polyName.c_str()); - - std::string surfaceName; - Globals::Instance->GetSegmentedPtrName(polyTypeDefAddress, parent, "SurfaceType", surfaceName, - parent->workerID); - declaration += StringHelper::Sprintf("\t%s,\n", surfaceName.c_str()); - - std::string camName; - Globals::Instance->GetSegmentedPtrName(camDataAddress, parent, "CamData", camName, - parent->workerID); - declaration += StringHelper::Sprintf("\t%s,\n", camName.c_str()); - - std::string waterBoxName; - Globals::Instance->GetSegmentedPtrName(waterBoxAddress, parent, "WaterBox", waterBoxName, - parent->workerID); - declaration += StringHelper::Sprintf("\t%i,\n\t%s\n", numWaterBoxes, waterBoxName.c_str()); - - return declaration; -} - -std::string ZCollisionHeader::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sCol_%06X", prefix.c_str(), rawDataIndex); -} - -std::string ZCollisionHeader::GetSourceTypeName() const -{ - return "CollisionHeader"; -} - -ZResourceType ZCollisionHeader::GetResourceType() const -{ - return ZResourceType::CollisionHeader; -} - -size_t ZCollisionHeader::GetRawDataSize() const -{ - return 44; -} - -WaterBoxHeader::WaterBoxHeader(const std::vector& rawData, uint32_t rawDataIndex) -{ - xMin = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - ySurface = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - zMin = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - xLength = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - zLength = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); - - if (Globals::Instance->game == ZGame::OOT_SW97) - properties = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); - else - properties = BitConverter::ToInt32BE(rawData, rawDataIndex + 12); -} - -std::string WaterBoxHeader::GetBodySourceCode() const -{ - return StringHelper::Sprintf("%i, %i, %i, %i, %i, 0x%08X", xMin, ySurface, zMin, xLength, - zLength, properties); -} - -CameraDataList::CameraDataList(ZFile* parent, const std::string& prefix, - const std::vector& rawData, offset_t rawDataIndex, - offset_t upperCameraBoundary) -{ - std::string declaration; - - // Parse CameraDataEntries - size_t numElements = (upperCameraBoundary - rawDataIndex) / 8; - assert(numElements < 10000); - - offset_t cameraPosDataSeg = rawDataIndex; - for (size_t i = 0; i < numElements; i++) - { - CameraDataEntry* entry = new CameraDataEntry(); - - entry->cameraSType = - BitConverter::ToInt16BE(rawData, rawDataIndex + (entries.size() * 8) + 0); - entry->numData = BitConverter::ToInt16BE(rawData, rawDataIndex + (entries.size() * 8) + 2); - entry->cameraPosDataSeg = - BitConverter::ToInt32BE(rawData, rawDataIndex + (entries.size() * 8) + 4); - - if (entry->cameraPosDataSeg != 0 && GETSEGNUM(entry->cameraPosDataSeg) != SEGMENT_SCENE) - { - cameraPosDataSeg = rawDataIndex + (entries.size() * 8); - break; - } - - if (entry->cameraPosDataSeg != 0 && cameraPosDataSeg > (entry->cameraPosDataSeg & 0xFFFFFF)) - cameraPosDataSeg = (entry->cameraPosDataSeg & 0xFFFFFF); - - entries.push_back(entry); - } - - // Setting cameraPosDataAddr to rawDataIndex give a pos list length of 0 - uint32_t cameraPosDataOffset = cameraPosDataSeg & 0xFFFFFF; - for (size_t i = 0; i < entries.size(); i++) - { - char camSegLine[2048]; - - if (entries[i]->cameraPosDataSeg != 0) - { - int32_t index = - ((entries[i]->cameraPosDataSeg & 0x00FFFFFF) - cameraPosDataOffset) / 0x6; - sprintf(camSegLine, "&%sCamPosData[%i]", prefix.c_str(), index); - } - else - sprintf(camSegLine, "NULL"); - - declaration += - StringHelper::Sprintf(" { 0x%04X, %i, %s },", entries[i]->cameraSType, - entries[i]->numData, camSegLine, rawDataIndex + (i * 8)); - - if (i < entries.size() - 1) - declaration += "\n"; - } - - parent->AddDeclarationArray( - rawDataIndex, DeclarationAlignment::Align4, entries.size() * 8, "CamData", - StringHelper::Sprintf("%sCamDataList", prefix.c_str(), rawDataIndex), entries.size(), - declaration); - - uint32_t numDataTotal = (rawDataIndex - cameraPosDataOffset) / 0x6; - - if (numDataTotal > 0) - { - declaration.clear(); - for (uint32_t i = 0; i < numDataTotal; i++) - { - CameraPositionData* data = - new CameraPositionData(rawData, cameraPosDataOffset + (i * 6)); - cameraPositionData.push_back(data); - - declaration += StringHelper::Sprintf("\t{ %6i, %6i, %6i },", data->x, data->y, data->z); - if (i + 1 < numDataTotal) - declaration += "\n"; - } - - int32_t cameraPosDataIndex = GETSEGOFFSET(cameraPosDataSeg); - uint32_t entrySize = numDataTotal * 0x6; - parent->AddDeclarationArray(cameraPosDataIndex, DeclarationAlignment::Align4, entrySize, - "Vec3s", StringHelper::Sprintf("%sCamPosData", prefix.c_str()), - numDataTotal, declaration); - } -} - -CameraDataList::~CameraDataList() -{ - for (auto entry : entries) - delete entry; - - for (auto camPosData : cameraPositionData) - delete camPosData; -} - -CameraPositionData::CameraPositionData(const std::vector& rawData, uint32_t rawDataIndex) -{ - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); -} diff --git a/ZAPDTR/ZAPD/ZCollision.h b/ZAPDTR/ZAPD/ZCollision.h deleted file mode 100644 index 7db03bf16..000000000 --- a/ZAPDTR/ZAPD/ZCollision.h +++ /dev/null @@ -1,90 +0,0 @@ -#pragma once - -#include "ZCollisionPoly.h" -#include "ZFile.h" -#include "ZResource.h" -#include "ZRoom/ZRoom.h" -#include "ZSurfaceType.h" -#include "ZVector.h" - -class WaterBoxHeader -{ -public: - int16_t xMin; - int16_t ySurface; - int16_t zMin; - int16_t xLength; - int16_t zLength; - int16_t pad; - int32_t properties; - - WaterBoxHeader(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; -}; - -class CameraPositionData -{ -public: - int16_t x, y, z; - - CameraPositionData(const std::vector& rawData, uint32_t rawDataIndex); -}; - -class CameraDataEntry -{ -public: - uint16_t cameraSType; - int16_t numData; - int32_t cameraPosDataSeg; -}; - -class CameraDataList -{ -public: - std::vector entries; - std::vector cameraPositionData; - - CameraDataList(ZFile* parent, const std::string& prefix, const std::vector& rawData, - offset_t rawDataIndex, offset_t upperCameraBoundary); - ~CameraDataList(); -}; - -class ZCollisionHeader : public ZResource -{ -public: - int16_t absMinX, absMinY, absMinZ; - int16_t absMaxX, absMaxY, absMaxZ; - uint16_t numVerts; - segptr_t vtxAddress; - uint16_t numPolygons; - segptr_t polyAddress; - segptr_t polyTypeDefAddress; - segptr_t camDataAddress; - - int32_t numWaterBoxes; - segptr_t waterBoxAddress; - - uint32_t vtxSegmentOffset, polySegmentOffset, polyTypeDefSegmentOffset, camDataSegmentOffset, - waterBoxSegmentOffset; - - std::vector vertices; - std::vector polygons; - std::vector PolygonTypes; - std::vector waterBoxes; - CameraDataList* camData = nullptr; - - ZCollisionHeader(ZFile* nParent); - ~ZCollisionHeader(); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZCollisionPoly.cpp b/ZAPDTR/ZAPD/ZCollisionPoly.cpp deleted file mode 100644 index c4eb2d461..000000000 --- a/ZAPDTR/ZAPD/ZCollisionPoly.cpp +++ /dev/null @@ -1,78 +0,0 @@ -#include "ZCollisionPoly.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -REGISTER_ZFILENODE(CollisionPoly, ZCollisionPoly); - -ZCollisionPoly::ZCollisionPoly(ZFile* nParent) : ZResource(nParent) -{ -} - -ZCollisionPoly::~ZCollisionPoly() -{ -} - -void ZCollisionPoly::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - type = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0); - - vtxA = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - vtxB = BitConverter::ToUInt16BE(rawData, rawDataIndex + 4); - vtxC = BitConverter::ToUInt16BE(rawData, rawDataIndex + 6); - - normX = BitConverter::ToUInt16BE(rawData, rawDataIndex + 8); - normY = BitConverter::ToUInt16BE(rawData, rawDataIndex + 10); - normZ = BitConverter::ToUInt16BE(rawData, rawDataIndex + 12); - - dist = BitConverter::ToUInt16BE(rawData, rawDataIndex + 14); -} - -void ZCollisionPoly::DeclareReferences(const std::string& prefix) -{ - std::string declaration; - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - parent->AddDeclaration(rawDataIndex, DeclarationAlignment::Align4, GetRawDataSize(), - GetSourceTypeName(), name.c_str(), GetBodySourceCode()); -} - -std::string ZCollisionPoly::GetBodySourceCode() const -{ - std::string declaration; - - declaration += - StringHelper::Sprintf("{0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X}", - type, vtxA, vtxB, vtxC, normX, normY, normZ, dist); - return declaration; -} - -std::string ZCollisionPoly::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sCollisionPoly_%06X", prefix.c_str(), rawDataIndex); -} - -ZResourceType ZCollisionPoly::GetResourceType() const -{ - return ZResourceType::CollisionPoly; -} - -size_t ZCollisionPoly::GetRawDataSize() const -{ - return 16; -} - -std::string ZCollisionPoly::GetSourceTypeName() const -{ - return "CollisionPoly"; -} - -bool ZCollisionPoly::DoesSupportArray() const -{ - return true; -} \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZCollisionPoly.h b/ZAPDTR/ZAPD/ZCollisionPoly.h deleted file mode 100644 index 64b98ba1d..000000000 --- a/ZAPDTR/ZAPD/ZCollisionPoly.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "ZFile.h" -#include "ZResource.h" - -class ZCollisionPoly : public ZResource -{ -public: - uint16_t type; - uint16_t vtxA, vtxB, vtxC; - uint16_t normX, normY, normZ; - uint16_t dist; - - ZCollisionPoly(ZFile* nParent); - ~ZCollisionPoly(); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - bool DoesSupportArray() const override; - - size_t GetRawDataSize() const override; -}; \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZCutscene.cpp b/ZAPDTR/ZAPD/ZCutscene.cpp deleted file mode 100644 index 605894979..000000000 --- a/ZAPDTR/ZAPD/ZCutscene.cpp +++ /dev/null @@ -1,389 +0,0 @@ -#include "ZCutscene.h" - -#include - -#include "Globals.h" -#include "OtherStructs/CutsceneMM_Commands.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZResource.h" - -REGISTER_ZFILENODE(Cutscene, ZCutscene); - -ZCutscene::ZCutscene(ZFile* nParent) : ZResource(nParent) -{ - genOTRDef = true; -} - -ZCutscene::~ZCutscene() -{ - for (CutsceneCommand* cmd : commands) - delete cmd; -} - -std::string ZCutscene::GetBodySourceCode() const -{ - std::string output = ""; - - output += StringHelper::Sprintf(" CS_BEGIN_CUTSCENE(%i, %i),\n", commands.size(), endFrame); - - for (size_t i = 0; i < commands.size(); i++) - { - CutsceneCommand* cmd = commands[i]; - output += " " + cmd->GenerateSourceCode(); - } - - output += StringHelper::Sprintf(" CS_END(),", commands.size(), endFrame); - - return output; -} - -size_t ZCutscene::GetRawDataSize() const -{ - size_t size = 0; - - // Beginning - size += 8; - - for (size_t i = 0; i < commands.size(); i++) - { - CutsceneCommand* cmd = commands[i]; - - size += cmd->GetCommandSize(); - } - - // End - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - size += 4; - } - else - { - size += 8; - } - - return size; -} - -void ZCutscene::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - - numCommands = BitConverter::ToInt32BE(rawData, rawDataIndex + 0); - commands = std::vector(); - - endFrame = BitConverter::ToInt32BE(rawData, rawDataIndex + 4); - offset_t currentPtr = rawDataIndex + 8; - commands.reserve(numCommands); - for (int32_t i = 0; i < numCommands; i++) - { - uint32_t id = BitConverter::ToUInt32BE(rawData, currentPtr); - - if (id == 0xFFFFFFFF) - break; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf("Cutscene Command: 0x%X (%i)\n", id, id); - } - - currentPtr += 4; - - CutsceneCommand* cmd = nullptr; - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - cmd = GetCommandMM(id, currentPtr); - } - else - { - cmd = GetCommandOoT(id, currentPtr); - } - - if (cmd == nullptr) - { - HANDLE_WARNING_RESOURCE( - WarningType::NotImplemented, parent, this, rawDataIndex, - StringHelper::Sprintf("Cutscene command not implemented"), - StringHelper::Sprintf("Command ID: 0x%X\nIndex: %d\ncurrentPtr-rawDataIndex: 0x%X", - id, i, currentPtr - rawDataIndex)); - cmd = new CutsceneMMCommand_NonImplemented(rawData, currentPtr); - } - - assert(cmd != nullptr); - - cmd->commandIndex = i; - cmd->SetCommandID(id); - size_t commmandSize = cmd->GetCommandSize(); - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - printf("\t Command size: 0x%zX (%zu)\n", commmandSize, commmandSize); - } - currentPtr += commmandSize - 4; - - commands.push_back(cmd); - } -} - -CutsceneCommand* ZCutscene::GetCommandOoT(uint32_t id, offset_t currentPtr) const -{ - CutsceneCommands cmdID = static_cast(id); - - const auto& rawData = parent->GetRawData(); - - switch (id) - { - case 10: // CutsceneCommands::SetPlayerAction - case 15: // CutsceneCommands::SetActorAction1 - case 17: - case 18: - case 23: - case 34: - case 39: - case 46: - case 76: - case 85: - case 93: - case 105: - case 107: - case 110: - case 119: - case 123: - case 138: - case 139: - case 144: - case 14: // CutsceneCommands::SetActorAction2 - case 16: - case 24: - case 35: - case 40: - case 48: - case 64: - case 68: - case 70: - case 78: - case 80: - case 94: - case 116: - case 118: - case 120: - case 125: - case 131: - case 141: - case 25: // CutsceneCommands::SetActorAction3 - case 36: - case 41: - case 50: - case 67: - case 69: - case 72: - case 81: - case 106: - case 117: - case 121: - case 126: - case 132: - case 29: // CutsceneCommands::SetActorAction4 - case 37: - case 42: - case 51: - case 53: - case 63: - case 65: - case 66: - case 75: - case 82: - case 108: - case 127: - case 133: - case 30: // CutsceneCommands::SetActorAction5 - case 38: - case 43: - case 47: - case 54: - case 79: - case 83: - case 128: - case 135: - case 44: // CutsceneCommands::SetActorAction6 - case 55: - case 77: - case 84: - case 90: - case 129: - case 136: - case 31: // CutsceneCommands::SetActorAction7 - case 52: - case 57: - case 58: - case 88: - case 115: - case 130: - case 137: - case 49: // CutsceneCommands::SetActorAction8 - case 60: - case 89: - case 111: - case 114: - case 134: - case 142: - case 62: // CutsceneCommands::SetActorAction9 - case 143: // CutsceneCommands::SetActorAction10 - return new CutsceneCommand_ActorAction(rawData, currentPtr); - - case 0x0B: - case 0x0D: - case 0x1A: - case 0x1B: - case 0x1C: - case 0x20: - case 0x21: - case 0x3B: - case 0x3D: - case 0x47: - case 0x49: - case 0x6D: - case 0x15: - case 0x16: - case 0x70: - case 0x71: - case 0x4A: - return new CutsceneCommand_GenericCmd(rawData, currentPtr, cmdID); - } - - switch (cmdID) - { - case CutsceneCommands::Misc: - case CutsceneCommands::SetLighting: - case CutsceneCommands::PlayBGM: - case CutsceneCommands::StopBGM: - case CutsceneCommands::FadeBGM: - return new CutsceneCommand_GenericCmd(rawData, currentPtr, cmdID); - - case CutsceneCommands::SetCameraPos: - case CutsceneCommands::SetCameraFocus: - case CutsceneCommands::SetCameraPosLink: - case CutsceneCommands::SetCameraFocusLink: - return new CutsceneCommandSetCameraPos(rawData, currentPtr); - - case CutsceneCommands::Cmd07: - break; - case CutsceneCommands::Cmd08: - break; - case CutsceneCommands::Cmd09: - return new CutsceneCommand_Rumble(rawData, currentPtr); - case CutsceneCommands::Textbox: - return new CutsceneCommand_TextBox(rawData, currentPtr); - - case CutsceneCommands::SetPlayerAction: - case CutsceneCommands::SetActorAction1: - case CutsceneCommands::SetActorAction2: - case CutsceneCommands::SetActorAction3: - case CutsceneCommands::SetActorAction4: - case CutsceneCommands::SetActorAction5: - case CutsceneCommands::SetActorAction6: - case CutsceneCommands::SetActorAction7: - case CutsceneCommands::SetActorAction8: - case CutsceneCommands::SetActorAction9: - case CutsceneCommands::SetActorAction10: - break; - - case CutsceneCommands::SetSceneTransFX: - return new CutsceneCommandSceneTransFX(rawData, currentPtr); - - case CutsceneCommands::SetTime: - return new CutsceneCommand_SetTime(rawData, currentPtr); - case CutsceneCommands::Terminator: - return new CutsceneCommand_Terminator(rawData, currentPtr); - } - - return nullptr; -} - -CutsceneCommand* ZCutscene::GetCommandMM(uint32_t id, offset_t currentPtr) const -{ - CutsceneMMCommands cmdID = static_cast(id); - - const auto& rawData = parent->GetRawData(); - - if (((id >= 100) && (id < 150)) || (id == 201) || ((id >= 450) && (id < 600))) - { - return new CutsceneCommand_ActorAction(rawData, currentPtr); - } - - switch (cmdID) - { - case CutsceneMMCommands::CS_CMD_MISC: - case CutsceneMMCommands::CS_CMD_SET_LIGHTING: - case CutsceneMMCommands::CS_CMD_SCENE_TRANS_FX: - case CutsceneMMCommands::CS_CMD_MOTIONBLUR: - case CutsceneMMCommands::CS_CMD_GIVETATL: - case CutsceneMMCommands::CS_CMD_PLAYSEQ: - case CutsceneMMCommands::CS_CMD_130: - case CutsceneMMCommands::CS_CMD_131: - case CutsceneMMCommands::CS_CMD_132: - case CutsceneMMCommands::CS_CMD_STOPSEQ: - case CutsceneMMCommands::CS_CMD_PLAYAMBIENCE: - case CutsceneMMCommands::CS_CMD_FADEAMBIENCE: - case CutsceneMMCommands::CS_CMD_TERMINATOR: - case CutsceneMMCommands::CS_CMD_CHOOSE_CREDITS_SCENES: - - case CutsceneMMCommands::CS_CMD_UNK_FA: - case CutsceneMMCommands::CS_CMD_UNK_FE: - case CutsceneMMCommands::CS_CMD_UNK_FF: - case CutsceneMMCommands::CS_CMD_UNK_100: - case CutsceneMMCommands::CS_CMD_UNK_101: - case CutsceneMMCommands::CS_CMD_UNK_102: - case CutsceneMMCommands::CS_CMD_UNK_103: - case CutsceneMMCommands::CS_CMD_UNK_104: - case CutsceneMMCommands::CS_CMD_UNK_105: - case CutsceneMMCommands::CS_CMD_UNK_108: - case CutsceneMMCommands::CS_CMD_UNK_109: - case CutsceneMMCommands::CS_CMD_UNK_12D: - return new CutsceneMMCommand_GenericCmd(rawData, currentPtr, cmdID); - - case CutsceneMMCommands::CS_CMD_TEXTBOX: - return new CutsceneCommand_TextBox(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_CAMERA: - return new CutsceneMMCommand_Camera(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_FADESCREEN: - return new CutsceneMMCommand_FadeScreen(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_FADESEQ: - return new CutsceneMMCommand_FadeSeq(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_SETTIME: - return new CutsceneCommand_SetTime(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_SET_PLAYER_ACTION: - return new CutsceneCommand_ActorAction(rawData, currentPtr); - case CutsceneMMCommands::CS_CMD_RUMBLE: - return new CutsceneCommand_Rumble(rawData, currentPtr); - } - - return nullptr; -} - -Declaration* ZCutscene::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (auxName == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, 0, bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZCutscene::GetSourceTypeName() const -{ - return "CutsceneData"; -} - -ZResourceType ZCutscene::GetResourceType() const -{ - return ZResourceType::Cutscene; -} diff --git a/ZAPDTR/ZAPD/ZCutscene.h b/ZAPDTR/ZAPD/ZCutscene.h deleted file mode 100644 index 098f3ad86..000000000 --- a/ZAPDTR/ZAPD/ZCutscene.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include -#include -#include -#include "tinyxml2.h" - -#include "OtherStructs/Cutscene_Commands.h" -#include "ZFile.h" -#include "ZResource.h" - -class ZCutscene : public ZResource -{ -public: - ZCutscene(ZFile* nParent); - ~ZCutscene(); - - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - int32_t numCommands; - int32_t endFrame; - std::vector commands; - -protected: - CutsceneCommand* GetCommandOoT(uint32_t id, offset_t currentPtr) const; - CutsceneCommand* GetCommandMM(uint32_t id, offset_t currentPtr) const; -}; diff --git a/ZAPDTR/ZAPD/ZDisplayList.cpp b/ZAPDTR/ZAPD/ZDisplayList.cpp deleted file mode 100644 index 9a43a2a22..000000000 --- a/ZAPDTR/ZAPD/ZDisplayList.cpp +++ /dev/null @@ -1,2257 +0,0 @@ -#include "ZDisplayList.h" - -#include -#include -#include -#include -#include - -#include "Globals.h" -#include "OutputFormatter.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "gfxd.h" - - -#define G_MDSFT_ALPHACOMPARE 0 -#define G_MDSFT_ZSRCSEL 2 -#define G_MDSFT_RENDERMODE 3 -#define G_MDSFT_BLENDER 16 - -#define G_RM_FOG_SHADE_A 0xC8000000 -#define G_RM_FOG_PRIM_A 0xC4000000 -#define G_RM_PASS 0x0C080000 -#define G_RM_AA_ZB_OPA_SURF 0x442078 -#define G_RM_AA_ZB_OPA_SURF2 0x112078 -#define G_RM_AA_ZB_XLU_SURF 0x4049D8 -#define G_RM_AA_ZB_XLU_SURF2 0x1049D8 -#define G_RM_AA_ZB_OPA_DECAL 0x442D58 -#define G_RM_AA_ZB_OPA_DECAL2 0x112D58 -#define G_RM_AA_ZB_XLU_DECAL 0x404DD8 -#define G_RM_AA_ZB_XLU_DECAL2 0x104DD8 -#define G_RM_AA_ZB_OPA_INTER 0x442478 -#define G_RM_AA_ZB_OPA_INTER2 0x112478 -#define G_RM_AA_ZB_XLU_INTER 0x4045D8 -#define G_RM_AA_ZB_XLU_INTER2 0x1045D8 -#define G_RM_AA_ZB_XLU_LINE 0x407858 -#define G_RM_AA_ZB_XLU_LINE2 0x107858 -#define G_RM_AA_ZB_DEC_LINE 0x407F58 -#define G_RM_AA_ZB_DEC_LINE2 0x107F58 -#define G_RM_AA_ZB_TEX_EDGE 0x443078 -#define G_RM_AA_ZB_TEX_EDGE2 0x113078 -#define G_RM_AA_ZB_TEX_INTER 0x443478 -#define G_RM_AA_ZB_TEX_INTER2 0x113478 -#define G_RM_AA_ZB_SUB_SURF 0x442878 -#define G_RM_AA_ZB_SUB_SURF2 0x112278 -#define G_RM_AA_ZB_PCL_SURF 0x40007B -#define G_RM_AA_ZB_PCL_SURF2 0x10007B -#define G_RM_AA_ZB_OPA_TERR 0x402078 -#define G_RM_AA_ZB_OPA_TERR2 0x102078 -#define G_RM_AA_ZB_TEX_TERR 0x403078 -#define G_RM_AA_ZB_TEX_TERR2 0x103078 -#define G_RM_AA_ZB_SUB_TERR 0x402278 -#define G_RM_AA_ZB_SUB_TERR2 0x102278 -#define G_RM_RA_ZB_OPA_SURF 0x442038 -#define G_RM_RA_ZB_OPA_SURF2 0x112038 -#define G_RM_RA_ZB_OPA_DECAL 0x442D18 -#define G_RM_RA_ZB_OPA_DECAL2 0x112D18 -#define G_RM_RA_ZB_OPA_INTER 0x442438 -#define G_RM_RA_ZB_OPA_INTER2 0x112438 -#define G_RM_AA_OPA_SURF 0x442048 -#define G_RM_AA_OPA_SURF2 0x112048 -#define G_RM_AA_XLU_SURF 0x4041C8 -#define G_RM_AA_XLU_SURF2 0x1041C8 -#define G_RM_AA_XLU_LINE 0x407048 -#define G_RM_AA_XLU_LINE2 0x107048 -#define G_RM_AA_DEC_LINE 0x407248 -#define G_RM_AA_DEC_LINE2 0x107248 -#define G_RM_AA_TEX_EDGE 0x443048 -#define G_RM_AA_TEX_EDGE2 0x113048 -#define G_RM_AA_SUB_SURF 0x442248 -#define G_RM_AA_SUB_SURF2 0x112248 -#define G_RM_AA_PCL_SURF 0x40004B -#define G_RM_AA_PCL_SURF2 0x10004B -#define G_RM_AA_OPA_TERR 0x402048 -#define G_RM_AA_OPA_TERR2 0x102048 -#define G_RM_AA_TEX_TERR 0x403048 -#define G_RM_AA_TEX_TERR2 0x103048 -#define G_RM_AA_SUB_TERR 0x402248 -#define G_RM_AA_SUB_TERR2 0x102248 -#define G_RM_RA_OPA_SURF 0x442008 -#define G_RM_RA_OPA_SURF2 0x112008 -#define G_RM_ZB_OPA_SURF 0x442230 -#define G_RM_ZB_OPA_SURF2 0x112230 -#define G_RM_ZB_XLU_SURF 0x404A50 -#define G_RM_ZB_XLU_SURF2 0x104A50 -#define G_RM_ZB_OPA_DECAL 0x442E10 -#define G_RM_ZB_OPA_DECAL2 0x112E10 -#define G_RM_ZB_XLU_DECAL 0x404E50 -#define G_RM_ZB_XLU_DECAL2 0x104E50 -#define G_RM_ZB_CLD_SURF 0x404B50 -#define G_RM_ZB_CLD_SURF2 0x104B50 -#define G_RM_ZB_OVL_SURF 0x404F50 -#define G_RM_ZB_OVL_SURF2 0x104F50 -#define G_RM_ZB_PCL_SURF 0x0C080233 -#define G_RM_ZB_PCL_SURF2 0x03020233 -#define G_RM_OPA_SURF 0x0C084000 -#define G_RM_OPA_SURF2 0x03024000 -#define G_RM_XLU_SURF 0x00404200 -#define G_RM_XLU_SURF2 0x00104240 -#define G_RM_CLD_SURF 0x00404340 -#define G_RM_CLD_SURF2 0x00104340 -#define G_RM_TEX_EDGE 0x0C087008 -#define G_RM_TEX_EDGE2 0x03027008 -#define G_RM_PCL_SURF 0x0C084203 -#define G_RM_PCL_SURF2 0x03024203 -#define G_RM_ADD 0x04484340 -#define G_RM_ADD2 0x01124340 -#define G_RM_NOOP 0x00000000 -#define G_RM_NOOP2 0x00000000 -#define G_RM_VISCVG 0x0C844040 -#define G_RM_VISCVG2 0x03214040 -#define G_RM_OPA_CI 0x0C080000 -#define G_RM_OPA_CI2 0x03020000 - -#define AA_EN 0x8 -#define Z_CMP 0x10 -#define Z_UPD 0x20 -#define IM_RD 0x40 -#define CLR_ON_CVG 0x80 -#define CVG_DST_CLAMP 0 -#define CVG_DST_WRAP 0x100 -#define CVG_DST_FULL 0x200 -#define CVG_DST_SAVE 0x300 -#define ZMODE_OPA 0 -#define ZMODE_INTER 0x400 -#define ZMODE_XLU 0x800 -#define ZMODE_DEC 0xc00 -#define CVG_X_ALPHA 0x1000 -#define ALPHA_CVG_SEL 0x2000 -#define FORCE_BL 0x4000 -#define TEX_EDGE 0x0000 - -REGISTER_ZFILENODE(DList, ZDisplayList); - -ZDisplayList::ZDisplayList(ZFile* nParent) : ZResource(nParent) -{ - lastTexWidth = 0; - lastTexHeight = 0; - lastTexAddr = 0; - lastTexFmt = F3DZEXTexFormats::G_IM_FMT_RGBA; - lastTexSiz = F3DZEXTexSizes::G_IM_SIZ_16b; - lastTexSizTest = F3DZEXTexSizes::G_IM_SIZ_16b; - lastTexLoaded = false; - lastTexIsPalette = false; - dListType = Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX; - genOTRDef = true; - RegisterOptionalAttribute("Ucode"); -} - -ZDisplayList::~ZDisplayList() -{ - for (auto o : otherDLists) - { - delete o; - } -} - -// EXTRACT MODE -void ZDisplayList::ExtractFromXML(tinyxml2::XMLElement* reader, uint32_t nRawDataIndex) -{ - rawDataIndex = nRawDataIndex; - ParseXML(reader); - // TODO add error handling here - bool ucodeSet = registeredAttributes.at("Ucode").wasSet; - std::string ucodeValue = registeredAttributes.at("Ucode").value; - if ((Globals::Instance->game == ZGame::OOT_SW97) || (ucodeValue == "f3dex")) - { - dListType = DListType::F3DEX; - } - else if (!ucodeSet || ucodeValue == "f3dex2") - { - dListType = DListType::F3DZEX; - } - else - { - HANDLE_ERROR_RESOURCE( - WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("Invalid ucode type in node: %s\n", reader->Name()), ""); - } - - // Don't parse raw data of external files - if (parent->GetMode() != ZFileMode::ExternalFile) - { - int32_t rawDataSize = - ZDisplayList::GetDListLength(parent->GetRawData(), rawDataIndex, dListType); - numInstructions = rawDataSize / 8; - ParseRawData(); - } - - Declaration* decl = DeclareVar("", ""); - decl->declaredInXml = true; -} - -void ZDisplayList::ExtractFromBinary(uint32_t nRawDataIndex, int32_t rawDataSize) -{ - rawDataIndex = nRawDataIndex; - name = GetDefaultName(parent->GetName()); - numInstructions = rawDataSize / 8; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); -} - -void ZDisplayList::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - instructions.reserve(numInstructions); - uint32_t ptr = rawDataIndex; - - instructions.reserve(numInstructions); - for (size_t i = 0; i < numInstructions; i++) - { - instructions.push_back(BitConverter::ToUInt64BE(rawData, ptr)); - ptr += 8; - } -} - -Declaration* ZDisplayList::DeclareVar([[maybe_unused]] const std::string& prefix, - const std::string& bodyStr) -{ - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), name, numInstructions, bodyStr); - decl->isExternal = true; - decl->staticConf = staticConf; - return decl; -} - -std::string ZDisplayList::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sDL_%06X", prefix.c_str(), rawDataIndex); -} - -void ZDisplayList::ParseF3DZEX(F3DZEXOpcode opcode, uint64_t data, int32_t i, - const std::string& prefix, char* line) -{ - switch (opcode) - { - case F3DZEXOpcode::G_NOOP: - sprintf(line, "gsDPNoOpTag(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - break; - case F3DZEXOpcode::G_DL: - Opcode_G_DL(data, prefix, line); - break; - case F3DZEXOpcode::G_MODIFYVTX: - Opcode_G_MODIFYVTX(data, line); - break; - case F3DZEXOpcode::G_CULLDL: - Opcode_G_CULLDL(data, line); - break; - case F3DZEXOpcode::G_TRI1: - Opcode_G_TRI1(data, line); - break; - case F3DZEXOpcode::G_TRI2: - Opcode_G_TRI2(data, line); - break; - case F3DZEXOpcode::G_QUAD: - { - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - int32_t dd = ((data & 0x000000000000FFULL)) / 2; - sprintf(line, "gsSP1Quadrangle(%i, %i, %i, %i, 0),", aa, bb, cc, dd); - } - break; - case F3DZEXOpcode::G_VTX: - Opcode_G_VTX(data, line); - break; - case F3DZEXOpcode::G_SETTIMG: // HOTSPOT - Opcode_G_SETTIMG(data, prefix, line); - break; - case F3DZEXOpcode::G_GEOMETRYMODE: - { - int32_t cccccc = (data & 0x00FFFFFF00000000) >> 32; - int32_t ssssssss = (data & 0xFFFFFFFF); - std::string geoModeStr = "G_TEXTURE_ENABLE"; - - int32_t geoModeParam = ~cccccc; - - if (ssssssss != 0) - geoModeParam = ssssssss; - - if (geoModeParam & 0x00000001) - geoModeStr += " | G_ZBUFFER"; - - if (geoModeParam & 0x00000004) - geoModeStr += " | G_SHADE"; - - if (geoModeParam & 0x00000200) - geoModeStr += " | G_CULL_FRONT"; - - if (geoModeParam & 0x00000400) - geoModeStr += " | G_CULL_BACK"; - - if (geoModeParam & 0x00010000) - geoModeStr += " | G_FOG"; - - if (geoModeParam & 0x00020000) - geoModeStr += " | G_LIGHTING"; - - if (geoModeParam & 0x00040000) - geoModeStr += " | G_TEXTURE_GEN"; - - if (geoModeParam & 0x00080000) - geoModeStr += " | G_TEXTURE_GEN_LINEAR"; - - if (geoModeParam & 0x00200000) - geoModeStr += " | G_SHADING_SMOOTH"; - - if (geoModeParam & 0x00800000) - geoModeStr += " | G_CLIPPING"; - - if (ssssssss != 0) - { - if ((~cccccc & 0xFF000000) != 0) - sprintf(line, "gsSPSetGeometryMode(%s),", geoModeStr.c_str()); - else - sprintf(line, "gsSPLoadGeometryMode(%s),", geoModeStr.c_str()); - } - else - sprintf(line, "gsSPClearGeometryMode(%s),", geoModeStr.c_str()); - } - break; - case F3DZEXOpcode::G_SETPRIMCOLOR: - Opcode_G_SETPRIMCOLOR(data, line); - break; - case F3DZEXOpcode::G_SETOTHERMODE_L: - Opcode_G_SETOTHERMODE_L(data, line); - break; - case F3DZEXOpcode::G_SETOTHERMODE_H: - Opcode_G_SETOTHERMODE_H(data, line); - break; - case F3DZEXOpcode::G_SETTILE: - Opcode_G_SETTILE(data, line); - break; - case F3DZEXOpcode::G_SETTILESIZE: - Opcode_G_SETTILESIZE(data, prefix, line); - break; - case F3DZEXOpcode::G_LOADBLOCK: - Opcode_G_LOADBLOCK(data, line); - break; - case F3DZEXOpcode::G_TEXTURE: - Opcode_G_TEXTURE(data, line); - break; - case F3DZEXOpcode::G_RDPSETOTHERMODE: - { - int32_t hhhhhh = (data & 0x00FFFFFF00000000) >> 32; - int32_t llllllll = (data & 0x00000000FFFFFFFF); - - sprintf(line, "gsDPSetOtherMode(%i, %i),", hhhhhh, llllllll); - } - break; - case F3DZEXOpcode::G_POPMTX: - { - sprintf(line, "gsSPPopMatrix(%" PRIi64 "),", data); - } - break; - case F3DZEXOpcode::G_LOADTLUT: - Opcode_G_LOADTLUT(data, prefix, line); - break; - case F3DZEXOpcode::G_SETENVCOLOR: - { - uint8_t r = (uint8_t)((data & 0xFF000000) >> 24); - uint8_t g = (uint8_t)((data & 0x00FF0000) >> 16); - uint8_t b = (uint8_t)((data & 0xFF00FF00) >> 8); - uint8_t a = (uint8_t)((data & 0x000000FF) >> 0); - - sprintf(line, "gsDPSetEnvColor(%i, %i, %i, %i),", r, g, b, a); - } - break; - case F3DZEXOpcode::G_SETCOMBINE: - { - Opcode_G_SETCOMBINE(data, line); - } - break; - case F3DZEXOpcode::G_RDPLOADSYNC: - sprintf(line, "gsDPLoadSync(),"); - break; - case F3DZEXOpcode::G_RDPPIPESYNC: - sprintf(line, "gsDPPipeSync(),"); - break; - case F3DZEXOpcode::G_RDPTILESYNC: - sprintf(line, "gsDPTileSync(),"); - break; - case F3DZEXOpcode::G_RDPFULLSYNC: - sprintf(line, "gsDPFullSync(),"); - break; - case F3DZEXOpcode::G_ENDDL: - Opcode_G_ENDDL(prefix, line); - break; - case F3DZEXOpcode::G_RDPHALF_1: - { - uint64_t data2 = instructions[i + 1]; - uint32_t h = (data & 0xFFFFFFFF); - F3DZEXOpcode opcode2 = (F3DZEXOpcode)(instructions[i + 1] >> 56); - - if (opcode2 == F3DZEXOpcode::G_BRANCH_Z) - { - uint32_t a = (data2 & 0x00FFF00000000000) >> 44; - uint32_t b = (data2 & 0x00000FFF00000000) >> 32; - uint32_t z = (data2 & 0x00000000FFFFFFFF) >> 0; - - // sprintf(line, "gsDPWord(%i, 0),", h); - sprintf(line, "gsSPBranchLessZraw(%sDlist0x%06X, 0x%02X, 0x%02X),", prefix.c_str(), - h & 0x00FFFFFF, (a / 5) | (b / 2), z); - - ZDisplayList* nList = new ZDisplayList(parent); - nList->ExtractFromBinary( - h & 0x00FFFFFF, GetDListLength(parent->GetRawData(), h & 0x00FFFFFF, dListType)); - nList->SetName(nList->GetDefaultName(prefix)); - otherDLists.push_back(nList); - - i++; - } - } - break; - case F3DZEXOpcode::G_MTX: - Opcode_G_MTX(data, line); - break; - default: - sprintf(line, "// Opcode 0x%02X unimplemented!", (uint32_t)opcode); - break; - } -} - -void ZDisplayList::ParseF3DEX(F3DEXOpcode opcode, uint64_t data, const std::string& prefix, - char* line) -{ - switch (opcode) - { - case F3DEXOpcode::G_NOOP: - sprintf(line, "gsDPNoOpTag(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - break; - case F3DEXOpcode::G_VTX: - Opcode_G_VTX(data, line); - break; - case F3DEXOpcode::G_DL: - Opcode_G_DL(data, prefix, line); - break; - case F3DEXOpcode::G_CULLDL: - Opcode_G_CULLDL(data, line); - break; - case F3DEXOpcode::G_MODIFYVTX: - Opcode_G_MODIFYVTX(data, line); - break; - case F3DEXOpcode::G_MTX: - Opcode_G_MTX(data, line); - break; - case F3DEXOpcode::G_TRI1: - Opcode_G_TRI1(data, line); - break; - case F3DEXOpcode::G_TRI2: - Opcode_G_TRI2(data, line); - break; - case F3DEXOpcode::G_ENDDL: - Opcode_G_ENDDL(prefix, line); - break; - case F3DEXOpcode::G_RDPLOADSYNC: - sprintf(line, "gsDPLoadSync(),"); - break; - case F3DEXOpcode::G_RDPPIPESYNC: - sprintf(line, "gsDPPipeSync(),"); - break; - case F3DEXOpcode::G_RDPTILESYNC: - sprintf(line, "gsDPTileSync(),"); - break; - case F3DEXOpcode::G_RDPFULLSYNC: - sprintf(line, "gsDPFullSync(),"); - break; - case F3DEXOpcode::G_TEXTURE: - Opcode_G_TEXTURE(data, line); - break; - case F3DEXOpcode::G_SETTIMG: - Opcode_G_SETTIMG(data, prefix, line); - break; - case F3DEXOpcode::G_SETTILE: - Opcode_G_SETTILE(data, line); - break; - case F3DEXOpcode::G_SETTILESIZE: - Opcode_G_SETTILESIZE(data, prefix, line); - break; - case F3DEXOpcode::G_LOADBLOCK: - Opcode_G_LOADBLOCK(data, line); - break; - case F3DEXOpcode::G_SETCOMBINE: - Opcode_G_SETCOMBINE(data, line); - break; - case F3DEXOpcode::G_SETPRIMCOLOR: - Opcode_G_SETPRIMCOLOR(data, line); - break; - case F3DEXOpcode::G_SETOTHERMODE_L: - Opcode_G_SETOTHERMODE_L(data, line); - break; - case F3DEXOpcode::G_SETOTHERMODE_H: - Opcode_G_SETOTHERMODE_H(data, line); - break; - case F3DEXOpcode::G_LOADTLUT: - Opcode_G_LOADTLUT(data, prefix, line); - break; - case F3DEXOpcode::G_CLEARGEOMETRYMODE: - case F3DEXOpcode::G_SETGEOMETRYMODE: - { - int32_t cccccc = (data & 0x00FFFFFF00000000) >> 32; - int32_t ssssssss = (data & 0xFFFFFFFF); - std::string geoModeStr = "G_TEXTURE_ENABLE"; - - int32_t geoModeParam = ~cccccc; - - if (ssssssss != 0) - geoModeParam = ssssssss; - - if (geoModeParam & 0x00000002) - geoModeStr += " | G_TEXTURE_ENABLE"; - - if (geoModeParam & 0x00000200) - geoModeStr += " | G_SHADING_SMOOTH"; - - if (geoModeParam & 0x00001000) - geoModeStr += " | G_CULL_FRONT"; - - if (geoModeParam & 0x00002000) - geoModeStr += " | G_CULL_BACK"; - - if (geoModeParam & 0x00000001) - geoModeStr += " | G_ZBUFFER"; - - if (geoModeParam & 0x00000004) - geoModeStr += " | G_SHADE"; - - if (geoModeParam & 0x00010000) - geoModeStr += " | G_FOG"; - - if (geoModeParam & 0x00020000) - geoModeStr += " | G_LIGHTING"; - - if (geoModeParam & 0x00040000) - geoModeStr += " | G_TEXTURE_GEN"; - - if (geoModeParam & 0x00080000) - geoModeStr += " | G_TEXTURE_GEN_LINEAR"; - - if (geoModeParam & 0x00800000) - geoModeStr += " | G_CLIPPING"; - - if (opcode == F3DEXOpcode::G_SETGEOMETRYMODE) - sprintf(line, "gsSPSetGeometryMode(%s),", geoModeStr.c_str()); - else - sprintf(line, "gsSPClearGeometryMode(%s),", geoModeStr.c_str()); - } - break; - default: - sprintf(line, "// Opcode 0x%02X unimplemented!", (uint32_t)opcode); - break; - } -} - -int32_t ZDisplayList::GetDListLength(const std::vector& rawData, uint32_t rawDataIndex, - DListType dListType) -{ - uint8_t endDLOpcode; - uint8_t branchListOpcode; - - if (dListType == DListType::F3DZEX) - { - endDLOpcode = static_cast(F3DZEXOpcode::G_ENDDL); - branchListOpcode = static_cast(F3DZEXOpcode::G_DL); - } - else - { - endDLOpcode = static_cast(F3DEXOpcode::G_ENDDL); - branchListOpcode = static_cast(F3DEXOpcode::G_DL); - } - - uint32_t ptr = rawDataIndex; - size_t rawDataSize = rawData.size(); - while (true) - { - if (ptr >= rawDataSize) - { - std::string errorHeader = - StringHelper::Sprintf("reached end of file when trying to find the end of the " - "DisplayList starting at offset 0x%X", - rawDataIndex); - std::string errorBody = StringHelper::Sprintf("Raw data size: 0x%zX.", rawDataSize); - HANDLE_ERROR_PROCESS(WarningType::Always, errorHeader, errorBody); - } - - uint8_t opcode = rawData.at(ptr); - bool dlNoPush = rawData.at(ptr + 1) == 1; - ptr += 8; - - if (opcode == endDLOpcode || (opcode == branchListOpcode && dlNoPush)) - { - return ptr - rawDataIndex; - } - } -} - -bool ZDisplayList::SequenceCheck(std::vector sequence, int32_t startIndex) -{ - bool success = true; - - for (size_t j = 0; j < sequence.size(); j++) - { - F3DZEXOpcode opcode = (F3DZEXOpcode)(instructions[startIndex + j] >> 56); - - if (sequence[j] != opcode) - { - success = false; - break; - } - } - - if (success) - return true; - - return false; -} - -int32_t ZDisplayList::OptimizationChecks(int32_t startIndex, std::string& output, - const std::string& prefix) -{ - int32_t result = -1; - - result = OptimizationCheck_LoadTextureBlock(startIndex, output, prefix); - - if (result != -1) - return result; - - return -1; -} - -int32_t ZDisplayList::OptimizationCheck_LoadTextureBlock(int32_t startIndex, std::string& output, - [[maybe_unused]] const std::string& prefix) -{ - std::vector sequence = {F3DZEXOpcode::G_SETTIMG, F3DZEXOpcode::G_SETTILE, - F3DZEXOpcode::G_RDPLOADSYNC, F3DZEXOpcode::G_LOADBLOCK, - F3DZEXOpcode::G_RDPPIPESYNC, F3DZEXOpcode::G_SETTILE, - F3DZEXOpcode::G_SETTILESIZE}; - - bool seqRes = SequenceCheck(sequence, startIndex); - - if (seqRes) - { - // gsDPLoadTextureBlock(texAddr, fmt, siz, width, height, pal, cms, cmt, masks, maskt, - // shifts, shiftt) gsDPLoadMultiBlock(texAddr, tmem, rtile, fmt, siz, width, height, pal, - // cms, cmt, masks, maskt, shifts, shiftt) gsDPLoadTextureBlock_4b(texAddr, fmt, width, - // height, pal, cms, cmt, masks, maskt, shifts, shiftt) gsDPLoadMultiBlock_4b(texAddr, tmem, - // rtile, fmt, width, height, pal, cms, cmt, masks, maskt, shifts, shiftt) - - uint32_t texAddr, tmem, rtile, fmt, siz, sizB, width, height, width2, height2, pal, cms, - cmt, masks, maskt, shifts, shiftt; - std::string texStr; - - // gsDPSetTextureImage - { - uint64_t data = instructions[startIndex + 0]; - - int32_t __ = (data & 0x00FF000000000000) >> 48; - // int32_t www = (data & 0x00000FFF00000000) >> 32; - - fmt = (__ & 0xE0) >> 5; - siz = (__ & 0x18) >> 3; - texAddr = Seg2Filespace(data, parent->baseAddress); - uint32_t segmentNumber = GETSEGNUM(data); - - lastTexSeg = segmentNumber; - - Globals::Instance->GetSegmentedPtrName(data & 0xFFFFFFFF, parent, "", texStr, - parent->workerID); - } - - // gsDPSetTile - { - uint64_t data = instructions[startIndex + 1]; - - tmem = - (data & 0b0000000000000000111111111111111100000000000000000000000000000000) >> 32; - - cmt = (data & 0b0000000000000000000000000000000000000000000011000000000000000000) >> 18; - maskt = - (data & 0b0000000000000000000000000000000000000000000000111100000000000000) >> 14; - shiftt = - (data & 0b0000000000000000000000000000000000000000000000000011110000000000) >> 10; - cms = (data & 0b0000000000000000000000000000000000000000000000000000001100000000) >> 8; - masks = - (data & 0b0000000000000000000000000000000000000000000000000000000011110000) >> 4; - shifts = (data & 0b0000000000000000000000000000000000000000000000000000000000001111); - - // sprintf(line, "gsDPSetTile(%s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - // fmtTbl[fff].c_str(), sizTbl[ii].c_str(), nnnnnnnnn, mmmmmmmmm, ttt, pppp, cc, aaaa, - // ssss, dd, bbbb, uuuu); - } - - // gsDPLoadSync - - // gsDPLoadBlock - - // gsDPPipeSync - - // gsDPSetTile - { - uint64_t data = instructions[startIndex + 5]; - int32_t __ = (data & 0x00FF000000000000) >> 48; - pal = (data & 0b0000000000000000000000000000000000000000111100000000000000000000) >> 20; - // siz = (__ & 0x18) >> 3; - rtile = - (data & 0b0000000000000000000000000000000011111111000000000000000000000000) >> 24; - sizB = (__ & 0x18) >> 3; - } - - // gsDPSetTileSize - { - uint64_t data = instructions[startIndex + 6]; - int32_t uuu = (data & 0x0000000000FFF000) >> 12; - int32_t vvv = (data & 0x0000000000000FFF); - - int32_t shiftAmtW = 2; - int32_t shiftAmtH = 2; - - if (sizB == (int32_t)F3DZEXTexSizes::G_IM_SIZ_8b && - fmt == (int32_t)F3DZEXTexFormats::G_IM_FMT_IA) - shiftAmtW = 3; - - if (sizB == (int32_t)F3DZEXTexSizes::G_IM_SIZ_4b) - shiftAmtW = 3; - - if (sizB == (int32_t)F3DZEXTexSizes::G_IM_SIZ_4b && - fmt == (int32_t)F3DZEXTexFormats::G_IM_FMT_IA) - shiftAmtH = 3; - - width = (uuu >> shiftAmtW) + 1; - height = (vvv >> shiftAmtH) + 1; - - width2 = (uuu >> 2) + 1; - height2 = (vvv >> 2) + 1; - } - - const char* fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", - "G_IM_FMT_I"}; - const char* sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; - - // output += StringHelper::Sprintf("gsDPLoadTextureBlock(%s, %s, %s, %i, %i, %i, %i, %i, %i, - // %i, %i, %i),", texStr.c_str(), fmtTbl[fmt], sizTbl[siz].c_str(), width, height, - // pal, cms, cmt, masks, maskt, shifts, shiftt); - - if (siz == 2 && sizB == 0) - { - if (tmem != 0) - output += StringHelper::Sprintf( - "gsDPLoadMultiBlock_4b(%s, %i, %i, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - texStr.c_str(), tmem, rtile, fmtTbl[fmt], width2, height2, pal, cms, cmt, masks, - maskt, shifts, shiftt); - else - output += StringHelper::Sprintf( - "gsDPLoadTextureBlock_4b(%s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - texStr.c_str(), fmtTbl[fmt], width2, height2, pal, cms, cmt, masks, maskt, - shifts, shiftt); - } - else if (siz == 2 && sizB != 0) - { - if (tmem != 0) - output += StringHelper::Sprintf( - "gsDPLoadMultiBlock(%s, %i, %i, %s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - texStr.c_str(), tmem, rtile, fmtTbl[fmt], sizTbl[sizB], width2, height2, pal, - cms, cmt, masks, maskt, shifts, shiftt); - else - output += StringHelper::Sprintf( - "gsDPLoadTextureBlock(%s, %s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - texStr.c_str(), fmtTbl[fmt], sizTbl[sizB], width2, height2, pal, cms, cmt, - masks, maskt, shifts, shiftt); - } - else - { - if (siz != sizB) - { - lastTexAddr = texAddr; - lastTexFmt = (F3DZEXTexFormats)fmt; - lastTexWidth = width; - lastTexHeight = height; - lastTexSiz = (F3DZEXTexSizes)siz; - lastTexLoaded = true; - - TextureGenCheck(); - - return -1; - } - - output += StringHelper::Sprintf( - "gsDPLoadMultiBlock(%s, %i, %i, %s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i),", - texStr.c_str(), tmem, rtile, fmtTbl[fmt], sizTbl[siz], width, height, pal, cms, cmt, - masks, maskt, shifts, shiftt); - } - - lastTexAddr = texAddr; - lastTexFmt = (F3DZEXTexFormats)fmt; - lastTexWidth = width; - lastTexHeight = height; - lastTexSiz = (F3DZEXTexSizes)siz; - lastTexLoaded = true; - - TextureGenCheck(); - - return (int32_t)sequence.size(); - } - - return -1; -} - -void ZDisplayList::Opcode_G_DL(uint64_t data, const std::string& prefix, char* line) -{ - int32_t pp = (data & 0x00FF000000000000) >> 56; - int32_t segNum = GETSEGNUM(data); - - Declaration* dListDecl = nullptr; - - if (parent != nullptr) - dListDecl = parent->GetDeclaration(GETSEGOFFSET(data)); - - if (pp != 0) - { - if (!Globals::Instance->HasSegment(segNum, parent->workerID)) - sprintf(line, "gsSPBranchList(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - else if (dListDecl != nullptr) - sprintf(line, "gsSPBranchList(%s),", dListDecl->varName.c_str()); - else - sprintf(line, "gsSPBranchList(%sDlist0x%06" PRIX64 "),", prefix.c_str(), - GETSEGOFFSET(data)); - } - else - { - if (!Globals::Instance->HasSegment(segNum, parent->workerID)) - sprintf(line, "gsSPDisplayList(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - else if (dListDecl != nullptr) - sprintf(line, "gsSPDisplayList(%s),", dListDecl->varName.c_str()); - else - sprintf(line, "gsSPDisplayList(%sDlist0x%06" PRIX64 "),", prefix.c_str(), - GETSEGOFFSET(data)); - } - - // if (segNum == 8 || segNum == 9 || segNum == 10 || segNum == 11 || segNum == 12 || segNum == - // 13) // Used for runtime-generated display lists - if (!Globals::Instance->HasSegment(segNum, parent->workerID)) - { - if (pp != 0) - sprintf(line, "gsSPBranchList(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - else - sprintf(line, "gsSPDisplayList(0x%08" PRIX64 "),", data & 0xFFFFFFFF); - } - else - { - ZDisplayList* nList = new ZDisplayList(parent); - nList->ExtractFromBinary(GETSEGOFFSET(data), GetDListLength(parent->GetRawData(), - GETSEGOFFSET(data), dListType)); - nList->SetName(nList->GetDefaultName(prefix)); - - otherDLists.push_back(nList); - } -} - -void ZDisplayList::Opcode_G_MODIFYVTX(uint64_t data, char* line) -{ - int32_t ww = (data & 0x00FF000000000000ULL) >> 48; - int32_t nnnn = (data & 0x0000FFFF00000000ULL) >> 32; - int32_t vvvvvvvv = (data & 0x00000000FFFFFFFFULL); - - sprintf(line, "gsSPModifyVertex(%i, %i, %i),", nnnn / 2, ww, vvvvvvvv); -} - -void ZDisplayList::Opcode_G_CULLDL(uint64_t data, char* line) -{ - int32_t vvvv = (data & 0xFFFF00000000) >> 32; - int32_t wwww = (data & 0x0000FFFF); - - sprintf(line, "gsSPCullDisplayList(%i, %i),", vvvv / 2, wwww / 2); -} - -void ZDisplayList::Opcode_G_TRI1(uint64_t data, char* line) -{ - if (dListType == DListType::F3DZEX) - { - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - sprintf(line, "gsSP1Triangle(%i, %i, %i, 0),", aa, bb, cc); - } - else - { - int32_t aa = ((data & 0x0000000000FF0000ULL) >> 16) / 2; - int32_t bb = ((data & 0x000000000000FF00ULL) >> 8) / 2; - int32_t cc = ((data & 0x00000000000000FFULL) >> 0) / 2; - sprintf(line, "gsSP1Triangle(%i, %i, %i, 0),", aa, bb, cc); - } -} - -void ZDisplayList::Opcode_G_TRI2(uint64_t data, char* line) -{ - int32_t aa = ((data & 0x00FF000000000000ULL) >> 48) / 2; - int32_t bb = ((data & 0x0000FF0000000000ULL) >> 40) / 2; - int32_t cc = ((data & 0x000000FF00000000ULL) >> 32) / 2; - int32_t dd = ((data & 0x00000000FF0000ULL) >> 16) / 2; - int32_t ee = ((data & 0x0000000000FF00ULL) >> 8) / 2; - int32_t ff = ((data & 0x000000000000FFULL) >> 0) / 2; - sprintf(line, "gsSP2Triangles(%i, %i, %i, 0, %i, %i, %i, 0),", aa, bb, cc, dd, ee, ff); -} - -void ZDisplayList::Opcode_G_MTX(uint64_t data, char* line) -{ - uint32_t pp = 0; - uint32_t mm = (data & 0x00000000FFFFFFFF); - bool push = false; - bool load = false; - bool projection = false; - - if (dListType == DListType::F3DEX) - pp = (data & 0x00FF000000000000) >> 48; - else - pp = (data & 0x000000FF00000000) >> 32; - - std::string matrixRef; - - if (Globals::Instance->cfg.symbolMap.find(mm) != Globals::Instance->cfg.symbolMap.end()) - matrixRef = StringHelper::Sprintf("&%s", Globals::Instance->cfg.symbolMap[mm].c_str()); - else - matrixRef = StringHelper::Sprintf("0x%08X", mm); - - pp ^= 0x01; - - if (pp & 0x01) - push = true; - - if (pp & 0x02) - load = true; - - if (pp & 0x04) - projection = true; - - sprintf(line, "gsSPMatrix(%s, %s | %s | %s),", matrixRef.c_str(), - projection ? "G_MTX_PROJECTION" : "G_MTX_MODELVIEW", - push ? "G_MTX_PUSH" : "G_MTX_NOPUSH", load ? "G_MTX_LOAD" : "G_MTX_MUL"); -} - -void ZDisplayList::Opcode_G_VTX(uint64_t data, char* line) -{ - int32_t nn = (data & 0x000FF00000000000ULL) >> 44; - int32_t aa = (data & 0x000000FF00000000ULL) >> 32; - - uint32_t vtxAddr = Seg2Filespace(data, parent->baseAddress); - - if (dListType == DListType::F3DZEX) - sprintf(line, "gsSPVertex(@r, %i, %i),", nn, ((aa >> 1) - nn)); - else - { - uint32_t hi = data >> 32; - -#define _SHIFTR(v, s, w) (((uint32_t)v >> s) & ((0x01 << w) - 1)) - - nn = _SHIFTR(hi, 10, 6); - - sprintf(line, "gsSPVertex(@r, %i, %i),", nn, _SHIFTR(hi, 17, 7)); - } - - // Hack: Don't extract vertices from a unknown segment. - if (!Globals::Instance->HasSegment(GETSEGNUM(data), parent->workerID)) - { - segptr_t segmented = data & 0xFFFFFFFF; - references.push_back(segmented); - parent->AddDeclaration(segmented, DeclarationAlignment::Align8, 16, "Vtx", - StringHelper::Sprintf("0x%08X", segmented), ""); - return; - } - references.push_back(data); - - { - uint32_t currentPtr = Seg2Filespace(data, parent->baseAddress); - Declaration* decl; - - // Check for vertex intersections from other display lists - // TODO: These two could probably be condenced to one... - decl = parent->GetDeclarationRanged(vtxAddr + (nn * 16)); - if (decl != nullptr) - { - int32_t diff = decl->address - vtxAddr; - if (diff > 0) - nn = diff / 16; - else - nn = 0; - } - - decl = parent->GetDeclarationRanged(vtxAddr); - if (decl != nullptr) - { - int32_t diff = decl->address - vtxAddr; - if (diff > 0) - nn = diff / 16; - else - nn = 0; - } - - if (nn > 0) - { - std::vector vtxList; - vtxList.reserve(nn); - - for (int32_t i = 0; i < nn; i++) - { - ZVtx vtx(parent); - vtx.ExtractFromFile(currentPtr); - vtxList.push_back(vtx); - - currentPtr += 16; - } - - vertices[vtxAddr] = vtxList; - } - } -} - -void ZDisplayList::Opcode_G_TEXTURE(uint64_t data, char* line) -{ - int32_t ____ = (data & 0x0000FFFF00000000) >> 32; - int32_t ssss = (data & 0x00000000FFFF0000) >> 16; - int32_t tttt = (data & 0x000000000000FFFF); - int32_t lll = (____ & 0x3800) >> 11; - int32_t ddd = (____ & 0x700) >> 8; - int32_t nnnnnnn = 0; - - if (dListType == DListType::F3DEX) - nnnnnnn = (____ & 0xFF); - else - nnnnnnn = (____ & 0xFE) >> 1; - - sprintf(line, "gsSPTexture(%i, %i, %i, %i, %s),", ssss, tttt, lll, ddd, - nnnnnnn == 1 ? "G_ON" : "G_OFF"); -} - -void ZDisplayList::Opcode_G_SETTIMG(uint64_t data, const std::string& prefix, char* line) -{ - int32_t __ = (data & 0x00FF000000000000) >> 48; - int32_t www = (data & 0x00000FFF00000000) >> 32; - const char* fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", - "G_IM_FMT_I"}; - const char* sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; - - uint32_t fmt = (__ & 0xE0) >> 5; - uint32_t siz = (__ & 0x18) >> 3; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("TextureGenCheck G_SETTIMG\n"); - - TextureGenCheck(); // HOTSPOT - - lastTexFmt = (F3DZEXTexFormats)fmt; - lastTexSiz = (F3DZEXTexSizes)siz; - lastTexSeg = data; - lastTexAddr = Seg2Filespace(data, parent->baseAddress); - - int32_t segmentNumber = GETSEGNUM(data); - - if (segmentNumber != 2) - { - char texStr[2048]; - int32_t texAddress = Seg2Filespace(data, parent->baseAddress); - Declaration* texDecl = nullptr; - - if (parent != nullptr) - { - if (Globals::Instance->HasSegment(segmentNumber, parent->workerID)) - texDecl = parent->GetDeclaration(texAddress); - else - texDecl = parent->GetDeclaration(data); - } - - if (texDecl != nullptr) - sprintf(texStr, "%s", texDecl->varName.c_str()); - else if (data != 0 && Globals::Instance->HasSegment(segmentNumber, parent->workerID)) - sprintf(texStr, "%sTex_%06X", prefix.c_str(), texAddress); - else - { - sprintf(texStr, "0x%08" PRIX64, data & 0xFFFFFFFF); - } - - sprintf(line, "gsDPSetTextureImage(%s, %s, %i, %s),", fmtTbl[fmt], sizTbl[siz], www + 1, - texStr); - } - else - { - std::string texName; - Globals::Instance->GetSegmentedPtrName(data, parent, "", texName, parent->workerID); - sprintf(line, "gsDPSetTextureImage(%s, %s, %i, %s),", fmtTbl[fmt], sizTbl[siz], www + 1, - texName.c_str()); - } -} - -void ZDisplayList::Opcode_G_SETTILE(uint64_t data, char* line) -{ - int32_t fff = (data & 0b0000000011100000000000000000000000000000000000000000000000000000) >> 53; - int32_t ii = (data & 0b0000000000011000000000000000000000000000000000000000000000000000) >> 51; - int32_t nnnnnnnnn = - (data & 0b0000000000000011111111100000000000000000000000000000000000000000) >> 41; - int32_t mmmmmmmmm = - (data & 0b0000000000000000000000011111111100000000000000000000000000000000) >> 32; - int32_t ttt = (data & 0b0000000000000000000000000000000000000111000000000000000000000000) >> 24; - int32_t pppp = - (data & 0b0000000000000000000000000000000000000000111100000000000000000000) >> 20; - int32_t cc = (data & 0b0000000000000000000000000000000000000000000011000000000000000000) >> 18; - int32_t aaaa = - (data & 0b0000000000000000000000000000000000000000000000111100000000000000) >> 14; - int32_t ssss = - (data & 0b0000000000000000000000000000000000000000000000000011110000000000) >> 10; - int32_t dd = (data & 0b0000000000000000000000000000000000000000000000000000001100000000) >> 8; - int32_t bbbb = (data & 0b0000000000000000000000000000000000000000000000000000000011110000) >> 4; - int32_t uuuu = (data & 0b0000000000000000000000000000000000000000000000000000000000001111); - - const char* fmtTbl[] = {"G_IM_FMT_RGBA", "G_IM_FMT_YUV", "G_IM_FMT_CI", "G_IM_FMT_IA", - "G_IM_FMT_I"}; - const char* sizTbl[] = {"G_IM_SIZ_4b", "G_IM_SIZ_8b", "G_IM_SIZ_16b", "G_IM_SIZ_32b"}; - - if (fff == (int32_t)F3DZEXTexFormats::G_IM_FMT_CI) - lastCISiz = (F3DZEXTexSizes)ii; - - lastTexSizTest = (F3DZEXTexSizes)ii; - - sprintf(line, "gsDPSetTile(%s, %s, %i, %i, %i, %i, %i, %i, %i, %i, %i, %i),", fmtTbl[fff], - sizTbl[ii], nnnnnnnnn, mmmmmmmmm, ttt, pppp, cc, aaaa, ssss, dd, bbbb, uuuu); -} - -void ZDisplayList::Opcode_G_SETTILESIZE(uint64_t data, [[maybe_unused]] const std::string& prefix, - char* line) -{ - int32_t sss = (data & 0x00FFF00000000000) >> 44; - int32_t ttt = (data & 0x00000FFF00000000) >> 32; - int32_t uuu = (data & 0x0000000000FFF000) >> 12; - int32_t vvv = (data & 0x0000000000000FFF); - int32_t i = (data & 0x000000000F000000) >> 24; - - int32_t shiftAmtW = 2; - int32_t shiftAmtH = 2; - - if (lastTexSizTest == F3DZEXTexSizes::G_IM_SIZ_8b && - lastTexFmt == F3DZEXTexFormats::G_IM_FMT_IA) - shiftAmtW = 3; - - // if (lastTexFmt == F3DZEXTexFormats::G_IM_FMT_I || lastTexFmt == - // F3DZEXTexFormats::G_IM_FMT_CI) - if (lastTexSizTest == F3DZEXTexSizes::G_IM_SIZ_4b) - shiftAmtW = 3; - - if (lastTexSizTest == F3DZEXTexSizes::G_IM_SIZ_4b && - lastTexFmt == F3DZEXTexFormats::G_IM_FMT_IA) - shiftAmtH = 3; - - lastTexWidth = (uuu >> shiftAmtW) + 1; - lastTexHeight = (vvv >> shiftAmtH) + 1; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("lastTexWidth: %i lastTexHeight: %i, lastTexSizTest: 0x%x, lastTexFmt: 0x%x\n", - lastTexWidth, lastTexHeight, (uint32_t)lastTexSizTest, (uint32_t)lastTexFmt); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("TextureGenCheck G_SETTILESIZE\n"); - - TextureGenCheck(); - - sprintf(line, "gsDPSetTileSize(%i, %i, %i, %i, %i),", i, sss, ttt, uuu, vvv); -} - -void ZDisplayList::Opcode_G_LOADBLOCK(uint64_t data, char* line) -{ - int32_t sss = (data & 0x00FFF00000000000) >> 48; - int32_t ttt = (data & 0x00000FFF00000000) >> 36; - int32_t i = (data & 0x000000000F000000) >> 24; - int32_t xxx = (data & 0x0000000000FFF000) >> 12; - int32_t ddd = (data & 0x0000000000000FFF); - - lastTexLoaded = true; - - sprintf(line, "gsDPLoadBlock(%i, %i, %i, %i, %i),", i, sss, ttt, xxx, ddd); -} - -void ZDisplayList::Opcode_G_SETCOMBINE(uint64_t data, char* line) -{ - int32_t a0 = (data & 0b000000011110000000000000000000000000000000000000000000000000000) >> 52; - int32_t c0 = (data & 0b000000000001111100000000000000000000000000000000000000000000000) >> 47; - int32_t aa0 = (data & 0b00000000000000011100000000000000000000000000000000000000000000) >> 44; - int32_t ac0 = (data & 0b00000000000000000011100000000000000000000000000000000000000000) >> 41; - int32_t a1 = (data & 0b000000000000000000000011110000000000000000000000000000000000000) >> 37; - int32_t c1 = (data & 0b000000000000000000000000001111100000000000000000000000000000000) >> 32; - int32_t b0 = (data & 0b000000000000000000000000000000011110000000000000000000000000000) >> 28; - int32_t b1 = (data & 0b000000000000000000000000000000000001111000000000000000000000000) >> 24; - int32_t aa1 = (data & 0b00000000000000000000000000000000000000111000000000000000000000) >> 21; - int32_t ac1 = (data & 0b00000000000000000000000000000000000000000111000000000000000000) >> 18; - int32_t d0 = (data & 0b000000000000000000000000000000000000000000000111000000000000000) >> 15; - int32_t ab0 = (data & 0b00000000000000000000000000000000000000000000000111000000000000) >> 12; - int32_t ad0 = (data & 0b00000000000000000000000000000000000000000000000000111000000000) >> 9; - int32_t d1 = (data & 0b000000000000000000000000000000000000000000000000000000111000000) >> 6; - int32_t ab1 = (data & 0b00000000000000000000000000000000000000000000000000000000111000) >> 3; - int32_t ad1 = (data & 0b00000000000000000000000000000000000000000000000000000000000111) >> 0; - - const char* modesA[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", "SHADE", "ENVIRONMENT", - "1", "NOISE", "0", "9", "10", "11", - "12", "13", "14", "0"}; - const char* modesB[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", "SHADE", "ENVIRONMENT", - "CENTER", "K4", "8", "9", "10", "11", - "12", "13", "14", "0"}; - const char* modesC[] = {"COMBINED", - "TEXEL0", - "TEXEL1", - "PRIMITIVE", - "SHADE", - "ENVIRONMENT", - "1", - "COMBINED_ALPHA", - "TEXEL0_ALPHA", - "TEXEL1_ALPHA", - "PRIMITIVE_ALPHA", - "SHADE_ALPHA", - "ENV_ALPHA", - "LOD_FRACTION", - "PRIM_LOD_FRAC", - "K5", - "16", - "17", - "18", - "19", - "20", - "21", - "22", - "23", - "24", - "25", - "26", - "27", - "28", - "29", - "30", - "0"}; - const char* modesD[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", - "SHADE", "ENVIRONMENT", "1", "0"}; - - const char* modes2[] = {"COMBINED", "TEXEL0", "TEXEL1", "PRIMITIVE", - "SHADE", "ENVIRONMENT", "1", "0"}; - const char* modes2C[] = {"LOD_FRACTION", "TEXEL0", "TEXEL1", "PRIMITIVE", - "SHADE", "ENVIRONMENT", "PRIM_LOD_FRAC", "0"}; - - sprintf(line, - "gsDPSetCombineLERP(%s, %s, %s, %s, %s, %s, %s, %s,\n %s, %s, " - "%s, %s, %s, %s, %s, %s),", - modesA[a0], modesB[b0], modesC[c0], modesD[d0], modes2[aa0], modes2[ab0], modes2C[ac0], - modes2[ad0], modesA[a1], modesB[b1], modesC[c1], modesD[d1], modes2[aa1], modes2[ab1], - modes2C[ac1], modes2[ad1]); -} - -void ZDisplayList::Opcode_G_SETPRIMCOLOR(uint64_t data, char* line) -{ - int32_t mm = (data & 0x0000FF0000000000) >> 40; - int32_t ff = (data & 0x000000FF00000000) >> 32; - int32_t rr = (data & 0x00000000FF000000) >> 24; - int32_t gg = (data & 0x0000000000FF0000) >> 16; - int32_t bb = (data & 0x000000000000FF00) >> 8; - int32_t aa = (data & 0x00000000000000FF) >> 0; - sprintf(line, "gsDPSetPrimColor(%i, %i, %i, %i, %i, %i),", mm, ff, rr, gg, bb, aa); -} - -void ZDisplayList::Opcode_F3DEX_G_SETOTHERMODE_L(uint64_t data, char* line) -{ - int32_t sft = (data & 0x0000FF0000000000) >> 40; - int32_t len = (data & 0x000000FF00000000) >> 32; - int32_t dat = (data & 0xFFFFFFFF); - - // TODO: Output the correct render modes in data - - sprintf(line, "gsSPSetOtherMode(0xE2, %i, %i, 0x%08X),", sft, len, dat); -} - -void ZDisplayList::Opcode_G_SETOTHERMODE_L(uint64_t data, char* line) -{ - int32_t dd = (data & 0xFFFFFFFF); - int32_t sft = 0; - int32_t len = 0; - - if (dListType == DListType::F3DEX) - { - sft = (data & 0x0000FF0000000000) >> 40; - len = (data & 0x000000FF00000000) >> 32; - } - else - { - int32_t ss = (data & 0x0000FF0000000000) >> 40; - len = ((data & 0x000000FF00000000) >> 32) + 1; - sft = 32 - (len)-ss; - } - - if (sft == G_MDSFT_RENDERMODE) - { - uint32_t mode1 = (dd & 0xCCCC0000) >> 0; - uint32_t mode2 = (dd & 0x3333FFFF); - - // TODO: Jesus Christ This is Messy - - uint32_t tblA[] = {G_RM_FOG_SHADE_A, - G_RM_FOG_PRIM_A, - G_RM_PASS, - G_RM_AA_ZB_OPA_SURF, - G_RM_AA_ZB_XLU_SURF, - G_RM_AA_ZB_OPA_DECAL, - G_RM_AA_ZB_XLU_DECAL, - G_RM_AA_ZB_OPA_INTER, - G_RM_AA_ZB_XLU_INTER, - G_RM_AA_ZB_XLU_LINE, - G_RM_AA_ZB_DEC_LINE, - G_RM_AA_ZB_TEX_EDGE, - G_RM_AA_ZB_TEX_INTER, - G_RM_AA_ZB_SUB_SURF, - G_RM_AA_ZB_PCL_SURF, - G_RM_AA_ZB_OPA_TERR, - G_RM_AA_ZB_TEX_TERR, - G_RM_AA_ZB_SUB_TERR, - G_RM_RA_ZB_OPA_SURF, - G_RM_RA_ZB_OPA_DECAL, - G_RM_RA_ZB_OPA_INTER, - G_RM_AA_OPA_SURF, - G_RM_AA_XLU_SURF, - G_RM_AA_XLU_LINE, - G_RM_AA_DEC_LINE, - G_RM_AA_TEX_EDGE, - G_RM_AA_SUB_SURF, - G_RM_AA_PCL_SURF, - G_RM_AA_OPA_TERR, - G_RM_AA_TEX_TERR, - G_RM_AA_SUB_TERR, - G_RM_RA_OPA_SURF, - G_RM_ZB_OPA_SURF, - G_RM_ZB_XLU_SURF, - G_RM_ZB_OPA_DECAL, - G_RM_ZB_XLU_DECAL, - G_RM_ZB_CLD_SURF, - G_RM_ZB_OVL_SURF, - G_RM_ZB_PCL_SURF, - G_RM_OPA_SURF, - G_RM_XLU_SURF, - G_RM_CLD_SURF, - G_RM_TEX_EDGE, - G_RM_PCL_SURF, - G_RM_ADD, - G_RM_NOOP, - G_RM_VISCVG, - G_RM_OPA_CI}; - - uint32_t tblB[] = {G_RM_AA_ZB_OPA_SURF2, - G_RM_AA_ZB_XLU_SURF2, - G_RM_AA_ZB_OPA_DECAL2, - G_RM_AA_ZB_XLU_DECAL2, - G_RM_AA_ZB_OPA_INTER2, - G_RM_AA_ZB_XLU_INTER2, - G_RM_AA_ZB_XLU_LINE2, - G_RM_AA_ZB_DEC_LINE2, - G_RM_AA_ZB_TEX_EDGE2, - G_RM_AA_ZB_TEX_INTER2, - G_RM_AA_ZB_SUB_SURF2, - G_RM_AA_ZB_PCL_SURF2, - G_RM_AA_ZB_OPA_TERR2, - G_RM_AA_ZB_TEX_TERR2, - G_RM_AA_ZB_SUB_TERR2, - G_RM_RA_ZB_OPA_SURF2, - G_RM_RA_ZB_OPA_DECAL2, - G_RM_RA_ZB_OPA_INTER2, - G_RM_AA_OPA_SURF2, - G_RM_AA_XLU_SURF2, - G_RM_AA_XLU_LINE2, - G_RM_AA_DEC_LINE2, - G_RM_AA_TEX_EDGE2, - G_RM_AA_SUB_SURF2, - G_RM_AA_PCL_SURF2, - G_RM_AA_OPA_TERR2, - G_RM_AA_TEX_TERR2, - G_RM_AA_SUB_TERR2, - G_RM_RA_OPA_SURF2, - G_RM_ZB_OPA_SURF2, - G_RM_ZB_XLU_SURF2, - G_RM_ZB_OPA_DECAL2, - G_RM_ZB_XLU_DECAL2, - G_RM_ZB_CLD_SURF2, - G_RM_ZB_OVL_SURF2, - G_RM_ZB_PCL_SURF2, - G_RM_OPA_SURF2, - G_RM_XLU_SURF2, - G_RM_CLD_SURF2, - G_RM_TEX_EDGE2, - G_RM_PCL_SURF2, - G_RM_ADD2, - G_RM_NOOP2, - G_RM_VISCVG2, - G_RM_OPA_CI2}; - - std::map str = { - {G_RM_FOG_SHADE_A, "G_RM_FOG_SHADE_A"}, - {G_RM_FOG_PRIM_A, "G_RM_FOG_PRIM_A"}, - {G_RM_PASS, "G_RM_PASS"}, - {G_RM_AA_ZB_OPA_SURF, "G_RM_AA_ZB_OPA_SURF"}, - {G_RM_AA_ZB_OPA_SURF2, "G_RM_AA_ZB_OPA_SURF2"}, - {G_RM_AA_ZB_XLU_SURF, "G_RM_AA_ZB_XLU_SURF"}, - {G_RM_AA_ZB_XLU_SURF2, "G_RM_AA_ZB_XLU_SURF2"}, - {G_RM_AA_ZB_OPA_DECAL, "G_RM_AA_ZB_OPA_DECAL"}, - {G_RM_AA_ZB_OPA_DECAL2, "G_RM_AA_ZB_OPA_DECAL2"}, - {G_RM_AA_ZB_XLU_DECAL, "G_RM_AA_ZB_XLU_DECAL"}, - {G_RM_AA_ZB_XLU_DECAL2, "G_RM_AA_ZB_XLU_DECAL2"}, - {G_RM_AA_ZB_OPA_INTER, "G_RM_AA_ZB_OPA_INTER"}, - {G_RM_AA_ZB_OPA_INTER2, "G_RM_AA_ZB_OPA_INTER2"}, - {G_RM_AA_ZB_XLU_INTER, "G_RM_AA_ZB_XLU_INTER"}, - {G_RM_AA_ZB_XLU_INTER2, "G_RM_AA_ZB_XLU_INTER2"}, - {G_RM_AA_ZB_XLU_LINE, "G_RM_AA_ZB_XLU_LINE"}, - {G_RM_AA_ZB_XLU_LINE2, "G_RM_AA_ZB_XLU_LINE2"}, - {G_RM_AA_ZB_DEC_LINE, "G_RM_AA_ZB_DEC_LINE"}, - {G_RM_AA_ZB_DEC_LINE2, "G_RM_AA_ZB_DEC_LINE2"}, - {G_RM_AA_ZB_TEX_EDGE, "G_RM_AA_ZB_TEX_EDGE"}, - {G_RM_AA_ZB_TEX_EDGE2, "G_RM_AA_ZB_TEX_EDGE2"}, - {G_RM_AA_ZB_TEX_INTER, "G_RM_AA_ZB_TEX_INTER"}, - {G_RM_AA_ZB_TEX_INTER2, "G_RM_AA_ZB_TEX_INTER2"}, - {G_RM_AA_ZB_SUB_SURF, "G_RM_AA_ZB_SUB_SURF"}, - {G_RM_AA_ZB_SUB_SURF2, "G_RM_AA_ZB_SUB_SURF2"}, - {G_RM_AA_ZB_PCL_SURF, "G_RM_AA_ZB_PCL_SURF"}, - {G_RM_AA_ZB_PCL_SURF2, "G_RM_AA_ZB_PCL_SURF2"}, - {G_RM_AA_ZB_OPA_TERR, "G_RM_AA_ZB_OPA_TERR"}, - {G_RM_AA_ZB_OPA_TERR2, "G_RM_AA_ZB_OPA_TERR2"}, - {G_RM_AA_ZB_TEX_TERR, "G_RM_AA_ZB_TEX_TERR"}, - {G_RM_AA_ZB_TEX_TERR2, "G_RM_AA_ZB_TEX_TERR2"}, - {G_RM_AA_ZB_SUB_TERR, "G_RM_AA_ZB_SUB_TERR"}, - {G_RM_AA_ZB_SUB_TERR2, "G_RM_AA_ZB_SUB_TERR2"}, - {G_RM_RA_ZB_OPA_SURF, "G_RM_RA_ZB_OPA_SURF"}, - {G_RM_RA_ZB_OPA_SURF2, "G_RM_RA_ZB_OPA_SURF2"}, - {G_RM_RA_ZB_OPA_DECAL, "G_RM_RA_ZB_OPA_DECAL"}, - {G_RM_RA_ZB_OPA_DECAL2, "G_RM_RA_ZB_OPA_DECAL2"}, - {G_RM_RA_ZB_OPA_INTER, "G_RM_RA_ZB_OPA_INTER"}, - {G_RM_RA_ZB_OPA_INTER2, "G_RM_RA_ZB_OPA_INTER2"}, - {G_RM_AA_OPA_SURF, "G_RM_AA_OPA_SURF"}, - {G_RM_AA_OPA_SURF2, "G_RM_AA_OPA_SURF2"}, - {G_RM_AA_XLU_SURF, "G_RM_AA_XLU_SURF"}, - {G_RM_AA_XLU_SURF2, "G_RM_AA_XLU_SURF2"}, - {G_RM_AA_XLU_LINE, "G_RM_AA_XLU_LINE"}, - {G_RM_AA_XLU_LINE2, "G_RM_AA_XLU_LINE2"}, - {G_RM_AA_DEC_LINE, "G_RM_AA_DEC_LINE"}, - {G_RM_AA_DEC_LINE2, "G_RM_AA_DEC_LINE2"}, - {G_RM_AA_TEX_EDGE, "G_RM_AA_TEX_EDGE"}, - {G_RM_AA_TEX_EDGE2, "G_RM_AA_TEX_EDGE2"}, - {G_RM_AA_SUB_SURF, "G_RM_AA_SUB_SURF"}, - {G_RM_AA_SUB_SURF2, "G_RM_AA_SUB_SURF2"}, - {G_RM_AA_PCL_SURF, "G_RM_AA_PCL_SURF"}, - {G_RM_AA_PCL_SURF2, "G_RM_AA_PCL_SURF2"}, - {G_RM_AA_OPA_TERR, "G_RM_AA_OPA_TERR"}, - {G_RM_AA_OPA_TERR2, "G_RM_AA_OPA_TERR2"}, - {G_RM_AA_TEX_TERR, "G_RM_AA_TEX_TERR"}, - {G_RM_AA_TEX_TERR2, "G_RM_AA_TEX_TERR2"}, - {G_RM_AA_TEX_TERR, "G_RM_AA_TEX_TERR"}, - {G_RM_AA_TEX_TERR2, "G_RM_AA_TEX_TERR2"}, - {G_RM_AA_SUB_TERR, "G_RM_AA_SUB_TERR"}, - {G_RM_AA_SUB_TERR2, "G_RM_AA_SUB_TERR2"}, - {G_RM_RA_OPA_SURF, "G_RM_RA_OPA_SURF"}, - {G_RM_RA_OPA_SURF2, "G_RM_RA_OPA_SURF2"}, - {G_RM_ZB_OPA_SURF, "G_RM_ZB_OPA_SURF"}, - {G_RM_ZB_OPA_SURF2, "G_RM_ZB_OPA_SURF2"}, - {G_RM_ZB_XLU_SURF, "G_RM_ZB_XLU_SURF"}, - {G_RM_ZB_XLU_SURF2, "G_RM_ZB_XLU_SURF2"}, - {G_RM_ZB_OPA_DECAL, "G_RM_ZB_OPA_DECAL"}, - {G_RM_ZB_OPA_DECAL2, "G_RM_ZB_OPA_DECAL2"}, - {G_RM_ZB_XLU_DECAL, "G_RM_ZB_XLU_DECAL"}, - {G_RM_ZB_XLU_DECAL2, "G_RM_ZB_XLU_DECAL2"}, - {G_RM_ZB_CLD_SURF, "G_RM_ZB_CLD_SURF"}, - {G_RM_ZB_CLD_SURF2, "G_RM_ZB_CLD_SURF2"}, - {G_RM_ZB_OVL_SURF, "G_RM_ZB_OVL_SURF"}, - {G_RM_ZB_OVL_SURF2, "G_RM_ZB_OVL_SURF2"}, - {G_RM_ZB_PCL_SURF, "G_RM_ZB_PCL_SURF"}, - {G_RM_ZB_PCL_SURF2, "G_RM_ZB_PCL_SURF2"}, - {G_RM_OPA_SURF, "G_RM_OPA_SURF"}, - {G_RM_OPA_SURF2, "G_RM_OPA_SURF2"}, - {G_RM_XLU_SURF, "G_RM_XLU_SURF"}, - {G_RM_XLU_SURF2, "G_RM_XLU_SURF2"}, - {G_RM_CLD_SURF, "G_RM_CLD_SURF"}, - {G_RM_CLD_SURF2, "G_RM_CLD_SURF2"}, - {G_RM_TEX_EDGE, "G_RM_TEX_EDGE"}, - {G_RM_TEX_EDGE2, "G_RM_TEX_EDGE2"}, - {G_RM_PCL_SURF, "G_RM_PCL_SURF"}, - {G_RM_PCL_SURF2, "G_RM_PCL_SURF2"}, - {G_RM_ADD, "G_RM_ADD"}, - {G_RM_ADD2, "G_RM_ADD2"}, - {G_RM_NOOP, "G_RM_NOOP"}, - {G_RM_NOOP2, "G_RM_NOOP2"}, - {G_RM_VISCVG, "G_RM_VISCVG"}, - {G_RM_VISCVG2, "G_RM_VISCVG2"}, - {G_RM_OPA_CI, "G_RM_OPA_CI"}, - {G_RM_OPA_CI2, "G_RM_OPA_CI2"}, - }; - - for (uint32_t k = 0; k < sizeof(tblA) / 4; k++) - { - if ((dd & tblA[k]) == tblA[k]) - { - if (tblA[k] > mode1) - mode1 = tblA[k]; - } - } - - for (uint32_t k = 0; k < sizeof(tblB) / 4; k++) - { - if ((dd & tblB[k]) == tblB[k]) - { - if (tblB[k] > mode2) - mode2 = tblB[k]; - } - } - - std::string mode1Str = str[mode1]; - std::string mode2Str = str[mode2]; - - if (mode1Str == "") - { - mode1Str = StringHelper::Sprintf("0x%08X", mode1); - } - - if (mode2Str == "") - { - if (mode2 & AA_EN) - { - mode2Str += "AA_EN | "; - } - - if (mode2 & Z_CMP) - { - mode2Str += "Z_CMP | "; - } - - if (mode2 & Z_UPD) - { - mode2Str += "Z_UPD | "; - } - - if (mode2 & IM_RD) - { - mode2Str += "IM_RD | "; - } - - if (mode2 & CLR_ON_CVG) - { - mode2Str += "CLR_ON_CVG | "; - } - - if (mode2 & CVG_DST_CLAMP) - { - mode2Str += "CVG_DST_CLAMP | "; - } - - if (mode2 & CVG_DST_WRAP) - { - mode2Str += "CVG_DST_WRAP | "; - } - - if (mode2 & CVG_DST_FULL) - { - mode2Str += "CVG_DST_FULL | "; - } - - if (mode2 & CVG_DST_SAVE) - { - mode2Str += "CVG_DST_SAVE | "; - } - - int32_t zMode = mode2 & 0xC00; - - if (zMode == ZMODE_INTER) - { - mode2Str += "ZMODE_INTER | "; - } - else if (zMode == ZMODE_XLU) - { - mode2Str += "ZMODE_XLU | "; - } - else if (zMode == ZMODE_DEC) - { - mode2Str += "ZMODE_DEC | "; - } - - if (mode2 & CVG_X_ALPHA) - { - mode2Str += "CVG_X_ALPHA | "; - } - - if (mode2 & ALPHA_CVG_SEL) - { - mode2Str += "ALPHA_CVG_SEL | "; - } - - if (mode2 & FORCE_BL) - { - mode2Str += "FORCE_BL | "; - } - - int32_t bp = (mode2 >> 28) & 0b11; - int32_t ba = (mode2 >> 24) & 0b11; - int32_t bm = (mode2 >> 20) & 0b11; - int32_t bb = (mode2 >> 16) & 0b11; - - mode2Str += StringHelper::Sprintf("GBL_c2(%i, %i, %i, %i)", bp, ba, bm, bb); - // mode2Str = StringHelper::Sprintf("0x%08X", mode2); - } - - sprintf(line, "gsDPSetRenderMode(%s, %s),", mode1Str.c_str(), mode2Str.c_str()); - } - else - { - sprintf(line, "gsSPSetOtherMode(0xE2, %i, %i, 0x%08X),", sft, len, dd); - } -} - -void ZDisplayList::Opcode_G_SETOTHERMODE_H(uint64_t data, char* line) -{ - int32_t ss = (data & 0x0000FF0000000000) >> 40; - int32_t nn = (data & 0x000000FF00000000) >> 32; - int32_t dd = (data & 0xFFFFFFFF); - - int32_t sft = 32 - (nn + 1) - ss; - - if (sft == 14) // G_MDSFT_TEXTLUT - { - const char* types[] = {"G_TT_NONE", "G_TT_NONE", "G_TT_RGBA16", "G_TT_IA16"}; - sprintf(line, "gsDPSetTextureLUT(%s),", types[dd >> 14]); - } - else - sprintf(line, "gsSPSetOtherMode(0xE3, %i, %i, 0x%08X),", sft, nn + 1, dd); -} - -void ZDisplayList::Opcode_G_LOADTLUT(uint64_t data, [[maybe_unused]] const std::string& prefix, - char* line) -{ - int32_t t = (data & 0x0000000007000000) >> 24; - int32_t ccc = (data & 0x00000000003FF000) >> 14; - - lastTexWidth = sqrt(ccc + 1); - lastTexHeight = sqrt(ccc + 1); - - lastTexLoaded = true; - lastTexIsPalette = true; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("TextureGenCheck G_LOADTLUT (lastCISiz: %i)\n", (uint32_t)lastCISiz); - - TextureGenCheck(); - - sprintf(line, "gsDPLoadTLUTCmd(%i, %i),", t, ccc); -} - -void ZDisplayList::Opcode_G_ENDDL([[maybe_unused]] const std::string& prefix, char* line) -{ - sprintf(line, "gsSPEndDisplayList(),"); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("TextureGenCheck G_ENDDL\n"); - - TextureGenCheck(); -} - -static int32_t GfxdCallback_FormatSingleEntry() -{ - ZDisplayList* self = static_cast(gfxd_udata_get()); - gfxd_puts("\t"); - gfxd_macro_dflt(); - gfxd_puts(","); - - auto macroId = gfxd_macro_id(); - - switch (macroId) - { - case gfxd_SP1Triangle: - case gfxd_SP2Triangles: - if (self->lastTexture != nullptr && self->lastTexture->IsColorIndexed() && - !self->lastTexture->HasTlut()) - { - auto tex = self->lastTexture; - auto tlut = self->lastTlut; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - { - if (tlut != nullptr) - printf("CI texture '%s' (0x%X), TLUT: '%s' (0x%X)\n", tex->GetName().c_str(), - tex->GetRawDataIndex(), tlut->GetName().c_str(), - tlut->GetRawDataIndex()); - else - printf("CI texture '%s' (0x%X), TLUT: null\n", tex->GetName().c_str(), - tex->GetRawDataIndex()); - } - - if (tlut != nullptr && !tex->HasTlut()) - tex->SetTlut(tlut); - } - break; - } - - // dont print a new line after the last command - switch (macroId) - { - case gfxd_SPEndDisplayList: - case gfxd_SPBranchList: - break; - - default: - gfxd_puts("\n"); - break; - } - - return 0; -} - -static int32_t GfxdCallback_Vtx(uint32_t seg, int32_t count) -{ - ZDisplayList* self = static_cast(gfxd_udata_get()); - uint32_t vtxOffset = Seg2Filespace(seg, self->parent->baseAddress); - - if (GETSEGNUM(seg) == self->parent->segment) - { - Declaration* decl; - - // Check for vertex intersections from other display lists - // TODO: These two could probably be condenced to one... - decl = self->parent->GetDeclarationRanged(vtxOffset + (count * 16)); - if (decl != nullptr) - { - int32_t diff = decl->address - vtxOffset; - - if (diff > 0) - count = diff / 16; - else - count = 0; - } - - decl = self->parent->GetDeclarationRanged(vtxOffset); - if (decl != nullptr) - { - int32_t diff = decl->address - vtxOffset; - - if (diff > 0) - count = diff / 16; - else - count = 0; - } - - if (count > 0) - { - std::vector vtxList; - vtxList.reserve(count); - - uint32_t currentPtr = vtxOffset; - for (int32_t i = 0; i < count; i++) - { - ZVtx vtx(self->parent); - vtx.ExtractFromFile(currentPtr); - - vtxList.push_back(vtx); - currentPtr += 16; - } - self->vertices[vtxOffset] = vtxList; - } - } - - self->references.push_back(seg); - - if (!Globals::Instance->otrMode) - gfxd_puts("@r"); - - return 1; -} - -static int32_t GfxdCallback_Texture(segptr_t seg, int32_t fmt, int32_t siz, int32_t width, - int32_t height, [[maybe_unused]] int32_t pal) -{ - ZDisplayList* self = static_cast(gfxd_udata_get()); - uint32_t texOffset = Seg2Filespace(seg, self->parent->baseAddress); - - self->lastTexWidth = width; - self->lastTexHeight = height; - self->lastTexAddr = texOffset; - self->lastTexSeg = seg; - self->lastTexFmt = static_cast(fmt); - self->lastTexSiz = static_cast(siz); - self->lastTexLoaded = true; - self->lastTexIsPalette = false; - - self->TextureGenCheck(); - - std::string texName; - Globals::Instance->GetSegmentedPtrName(seg, self->parent, "", texName, self->parent->workerID); - - gfxd_puts(texName.c_str()); - - return 1; -} - -static int32_t GfxdCallback_Palette(uint32_t seg, [[maybe_unused]] int32_t idx, int32_t count) -{ - ZDisplayList* self = static_cast(gfxd_udata_get()); - uint32_t palOffset = Seg2Filespace(seg, self->parent->baseAddress); - - self->lastTexWidth = sqrt(count); - self->lastTexHeight = sqrt(count); - self->lastTexAddr = palOffset; - self->lastTexSeg = seg; - self->lastTexSiz = F3DZEXTexSizes::G_IM_SIZ_16b; - self->lastTexFmt = F3DZEXTexFormats::G_IM_FMT_RGBA; - self->lastTexLoaded = true; - self->lastTexIsPalette = true; - - self->TextureGenCheck(); - - std::string palName; - Globals::Instance->GetSegmentedPtrName(seg, self->parent, "", palName, self->parent->workerID); - - gfxd_puts(palName.c_str()); - - return 1; -} - -static int32_t GfxdCallback_DisplayList(uint32_t seg) -{ - ZDisplayList* self = static_cast(gfxd_udata_get()); - uint32_t dListOffset = GETSEGOFFSET(seg); - uint32_t dListSegNum = GETSEGNUM(seg); - - std::string dListName = ""; - bool addressFound = Globals::Instance->GetSegmentedPtrName(seg, self->parent, "Gfx", dListName, - self->parent->workerID); - - if (!addressFound && self->parent->segment == dListSegNum) - { - ZDisplayList* newDList = new ZDisplayList(self->parent); - newDList->ExtractFromBinary( - dListOffset, - self->GetDListLength(self->parent->GetRawData(), dListOffset, self->dListType)); - newDList->SetName(newDList->GetDefaultName(self->parent->GetName())); - self->otherDLists.push_back(newDList); - dListName = newDList->GetName(); - } - - gfxd_puts(dListName.c_str()); - - return 1; -} - -static int32_t GfxdCallback_Matrix(uint32_t seg) -{ - std::string mtxName; - ZDisplayList* self = static_cast(gfxd_udata_get()); - - bool addressFound = Globals::Instance->GetSegmentedPtrName(seg, self->parent, "Mtx", mtxName, - self->parent->workerID); - if (!addressFound && GETSEGNUM(seg) == self->parent->segment) - { - Declaration* decl = - self->parent->GetDeclaration(Seg2Filespace(seg, self->parent->baseAddress)); - if (decl == nullptr) - { - ZMtx* mtx = new ZMtx(self->parent); - mtx->SetName(mtx->GetDefaultName(self->GetName())); - mtx->ExtractFromFile(Seg2Filespace(seg, self->parent->baseAddress)); - mtx->DeclareVar(self->GetName(), ""); - - mtx->GetSourceOutputCode(self->GetName()); - self->mtxList.push_back(*mtx); - self->parent->resources.push_back(mtx); - mtxName = "&" + mtx->GetName(); - } - } - - gfxd_puts(mtxName.c_str()); - - return 1; -} - -void ZDisplayList::DeclareReferences(const std::string& prefix) -{ - std::string sourceOutput; - - if (Globals::Instance->useLegacyZDList) - sourceOutput += ProcessLegacy(prefix); - else - sourceOutput += ProcessGfxDis(prefix); - - // Iterate through our vertex lists, connect intersecting lists. - if (vertices.size() > 0) - { - std::vector>> verticesSorted(vertices.begin(), - vertices.end()); - - for (size_t i = 0; i < verticesSorted.size() - 1; i++) - { - size_t vtxSize = vertices[verticesSorted[i].first].size() * 16; - - if ((verticesSorted[i].first + vtxSize) > verticesSorted[i + 1].first) - { - int32_t intersectAmt = - (verticesSorted[i].first + vtxSize) - verticesSorted[i + 1].first; - int32_t intersectIndex = intersectAmt / 16; - - for (size_t j = intersectIndex; j < verticesSorted[i + 1].second.size(); j++) - vertices[verticesSorted[i].first].push_back(verticesSorted[i + 1].second[j]); - - vertices.erase(verticesSorted[i + 1].first); - verticesSorted.erase(verticesSorted.begin() + i + 1); - - i--; - } - } - - // Generate Vertex Declarations - for (auto& item : vertices) - { - std::string declaration = ""; - - offset_t curAddr = item.first; - auto& firstVtx = item.second.at(0); - - for (auto vtx : item.second) - declaration += StringHelper::Sprintf("\t%s,\n", vtx.GetBodySourceCode().c_str()); - - Declaration* decl = parent->AddDeclarationArray( - curAddr, firstVtx.GetDeclarationAlignment(), - item.second.size() * firstVtx.GetRawDataSize(), firstVtx.GetSourceTypeName(), - firstVtx.GetDefaultName(name), item.second.size(), declaration); - - /*for (auto vtx : item.second) - { - ZVtx* nVtx = new ZVtx(vtx.parent); - nVtx->x = vtx.x; - nVtx->y = vtx.y; - nVtx->z = vtx.z; - nVtx->flag = vtx.flag; - nVtx->s = vtx.s; - nVtx->t = vtx.t; - nVtx->r = vtx.r; - nVtx->g = vtx.g; - nVtx->b = vtx.b; - nVtx->a = vtx.a; - decl->vertexHack.push_back(nVtx); - }*/ - - decl->isExternal = true; - } - } - - Declaration* decl = DeclareVar("", sourceOutput); - decl->references = references; - - // Iterate through our vertex lists, connect intersecting lists. - if (vertices.size() > 0) - { - std::vector>> verticesSorted(vertices.begin(), - vertices.end()); - - for (size_t i = 0; i < verticesSorted.size() - 1; i++) - { - // int32_t vtxSize = verticesSorted[i].second.size() * 16; - size_t vtxSize = vertices[verticesSorted[i].first].size() * 16; - - if ((verticesSorted[i].first + vtxSize) > verticesSorted[i + 1].first) - { - int32_t intersectAmt = - (verticesSorted[i].first + vtxSize) - verticesSorted[i + 1].first; - int32_t intersectIndex = intersectAmt / 16; - - for (size_t j = intersectIndex; j < verticesSorted[i + 1].second.size(); j++) - vertices[verticesSorted[i].first].push_back(verticesSorted[i + 1].second[j]); - - vertices.erase(verticesSorted[i + 1].first); - verticesSorted.erase(verticesSorted.begin() + i + 1); - - i--; - } - } - - // Generate Vertex Declarations - std::vector vtxKeys; - vtxKeys.reserve(vertices.size()); - for (auto& item : vertices) - vtxKeys.push_back(item.first); - - // for (pair> item : vertices) - for (size_t i = 0; i < vtxKeys.size(); i++) - { - auto& item = vertices[vtxKeys[i]]; - - //std::string declaration; - - //for (auto& vtx : item) - //declaration += StringHelper::Sprintf("\t%s,\n", vtx.GetBodySourceCode().c_str()); - - // Ensure there's always a trailing line feed to prevent dumb warnings. - // Please don't remove this line, unless you somehow made a way to prevent - // that warning when building the OoT repo. - //declaration += "\n"; - - if (parent != nullptr) - { - std::string vtxName; - ZResource* vtxRes = parent->FindResource(vtxKeys[i]); - - if (vtxRes != nullptr) - vtxName = vtxRes->GetName(); - else - vtxName = StringHelper::Sprintf("%sVtx_%06X", prefix.c_str(), vtxKeys[i]); - - auto filepath = Globals::Instance->outputPath / vtxName; - std::string incStr = StringHelper::Sprintf("%s.%s.inc", filepath.string().c_str(), "vtx"); - - Declaration* vtxDecl = parent->AddDeclarationIncludeArray( - vtxKeys[i], incStr, item.size() * 16, "Vtx", vtxName, item.size()); - vtxDecl->isExternal = true; - } - } - } -} - -std::string ZDisplayList::ProcessLegacy(const std::string& prefix) -{ - char line[4096]; - std::string sourceOutput; - - for (size_t i = 0; i < instructions.size(); i++) - { - uint8_t opcode = (uint8_t)(instructions[i] >> 56); - uint64_t data = instructions[i]; - sourceOutput += " "; - - auto start = std::chrono::steady_clock::now(); - - int32_t optimizationResult = OptimizationChecks(i, sourceOutput, prefix); - - if (optimizationResult != -1) - { - i += optimizationResult - 1; - line[0] = '\0'; - } - else - { - if (dListType == DListType::F3DZEX) - ParseF3DZEX((F3DZEXOpcode)opcode, data, i, prefix, line); - else - ParseF3DEX((F3DEXOpcode)opcode, data, prefix, line); - } - - auto end = std::chrono::steady_clock::now(); - int64_t diff = std::chrono::duration_cast(end - start).count(); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG && diff > 5) - printf("F3DOP: 0x%02X, TIME: %" PRIi64 "ms\n", opcode, diff); - - sourceOutput += line; - - if (i < instructions.size() - 1) - sourceOutput += "\n"; - } - - return sourceOutput; -} - -std::string ZDisplayList::ProcessGfxDis([[maybe_unused]] const std::string& prefix) -{ - std::string sourceOutput; - - OutputFormatter outputformatter; - int32_t dListSize = instructions.size() * sizeof(instructions[0]); - - gfxd_input_buffer(instructions.data(), dListSize); - gfxd_endian(gfxd_endian_little, sizeof(uint64_t)); // tell gfxdis what format the data is - - gfxd_macro_fn(GfxdCallback_FormatSingleEntry); // format for each command entry - gfxd_vtx_callback(GfxdCallback_Vtx); // handle vertices - gfxd_timg_callback(GfxdCallback_Texture); // handle textures - gfxd_tlut_callback(GfxdCallback_Palette); // handle palettes - gfxd_dl_callback(GfxdCallback_DisplayList); // handle child display lists - gfxd_mtx_callback(GfxdCallback_Matrix); // handle matrices - gfxd_output_callback( - outputformatter.StaticWriter()); // convert tabs to 4 spaces and enforce 120 line limit - - gfxd_enable(gfxd_emit_dec_color); // use decimal for colors - - // set microcode. see gfxd.h for more options. - if (dListType == DListType::F3DZEX) - gfxd_target(gfxd_f3dex2); - else - gfxd_target(gfxd_f3dex); - - gfxd_udata_set(this); - gfxd_execute(); // generate display list - sourceOutput += outputformatter.GetOutput(); // write formatted display list - - return sourceOutput; -} - -void ZDisplayList::TextureGenCheck() -{ - if (TextureGenCheck(lastTexWidth, lastTexHeight, lastTexAddr, lastTexSeg, lastTexFmt, - lastTexSiz, lastTexLoaded, lastTexIsPalette, this)) - { - lastTexAddr = 0; - lastTexLoaded = false; - lastTexIsPalette = false; - } -} - -bool ZDisplayList::TextureGenCheck(int32_t texWidth, int32_t texHeight, uint32_t texAddr, - uint32_t texSeg, F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, - bool texLoaded, bool texIsPalette, ZDisplayList* self) -{ - uint32_t segmentNumber = GETSEGNUM(texSeg); - - if (!texIsPalette) - self->lastTexture = nullptr; - else - self->lastTlut = nullptr; - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG) - printf("TextureGenCheck seg=%i width=%i height=%i ispal=%i addr=0x%06X\n", segmentNumber, - texWidth, texHeight, texIsPalette, texAddr); - - if ((texSeg != 0 || texAddr != 0) && texWidth > 0 && texHeight > 0 && texLoaded && - Globals::Instance->HasSegment(segmentNumber, self->parent->workerID)) - { - ZFile* auxParent = nullptr; - if (segmentNumber == self->parent->segment) - { - auxParent = self->parent; - } - else - { - // Try to find a non-external file (i.e., one we are actually extracting) - // which has the same segment number we are looking for. - auto segs = Globals::Instance->GetSegmentRefFiles(self->parent->workerID); - for (auto& otherFile : segs[segmentNumber]) - { - if (!otherFile->isExternalFile) - { - auxParent = otherFile; - } - } - } - - if (auxParent == nullptr) - { - // We can't declare the texture in any of the files we are extracting. - return false; - } - - if (auxParent->IsOffsetInFileRange(texAddr)) - { - ZTexture* tex = auxParent->GetTextureResource(texAddr); - if (tex != nullptr) - tex->isPalette = texIsPalette; - else - { - tex = new ZTexture(auxParent); - tex->ExtractFromBinary(texAddr, texWidth, texHeight, - TexFormatToTexType(texFmt, texSiz), texIsPalette); - auxParent->AddTextureResource(texAddr, tex); - } - - if (!texIsPalette) - self->lastTexture = tex; - else - self->lastTlut = tex; - - if (auxParent->GetDeclaration(texAddr) == nullptr) - { - tex->DeclareVar(self->GetName(), ""); - } - - return true; - } - } - - return false; -} - -TextureType ZDisplayList::TexFormatToTexType(F3DZEXTexFormats fmt, F3DZEXTexSizes siz) -{ - if (fmt == F3DZEXTexFormats::G_IM_FMT_RGBA) - { - if (siz == F3DZEXTexSizes::G_IM_SIZ_16b) - return TextureType::RGBA16bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_32b) - return TextureType::RGBA32bpp; - } - else if (fmt == F3DZEXTexFormats::G_IM_FMT_CI) - { - if (Globals::Instance->useLegacyZDList) - return TextureType::Palette8bpp; - else - { - if (siz == F3DZEXTexSizes::G_IM_SIZ_4b) - return TextureType::Palette4bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_8b) - return TextureType::Palette8bpp; - } - } - else if (fmt == F3DZEXTexFormats::G_IM_FMT_IA) - { - if (siz == F3DZEXTexSizes::G_IM_SIZ_4b) - return TextureType::GrayscaleAlpha4bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_8b) - return TextureType::GrayscaleAlpha8bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_16b) - return TextureType::GrayscaleAlpha16bpp; - } - else if (fmt == F3DZEXTexFormats::G_IM_FMT_I) - { - if (siz == F3DZEXTexSizes::G_IM_SIZ_4b) - return TextureType::Grayscale4bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_8b) - return TextureType::Grayscale8bpp; - else if (siz == F3DZEXTexSizes::G_IM_SIZ_16b) - return TextureType::Grayscale8bpp; - } - - return TextureType::RGBA16bpp; -} - -bool ZDisplayList::IsExternalResource() const -{ - return false; -} - -std::string ZDisplayList::GetExternalExtension() const -{ - return "dlist"; -} - -std::string ZDisplayList::GetSourceTypeName() const -{ - return "Gfx"; -} - -ZResourceType ZDisplayList::GetResourceType() const -{ - return ZResourceType::DisplayList; -} - -size_t ZDisplayList::GetRawDataSize() const -{ - return instructions.size() * 8; -} - -DeclarationAlignment ZDisplayList::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align8; -} diff --git a/ZAPDTR/ZAPD/ZDisplayList.h b/ZAPDTR/ZAPD/ZDisplayList.h deleted file mode 100644 index f3828cc79..000000000 --- a/ZAPDTR/ZAPD/ZDisplayList.h +++ /dev/null @@ -1,262 +0,0 @@ -#pragma once - -#include "ZMtx.h" -#include "ZResource.h" -#include "ZRoom/ZRoom.h" -#include "ZTexture.h" -#include "ZVtx.h" -#include "tinyxml2.h" - -#include -#include -#include - -enum class F3DEXOpcode -{ - G_SPNOOP = 0x00, - G_MTX = 0x01, - G_MOVEMEM = 0x03, - G_VTX = 0x04, - G_DL = 0x06, - G_LOAD_UCODE = 0xAF, - G_BRANCH_Z = 0xB0, - G_TRI2 = 0xB1, - G_MODIFYVTX = 0xB2, - G_RDPHALF_2 = 0xB3, - G_RDPHALF_1 = 0xB4, - G_QUAD = 0xB5, - G_CLEARGEOMETRYMODE = 0xB6, - G_SETGEOMETRYMODE = 0xB7, - G_ENDDL = 0xB8, - G_SETOTHERMODE_L = 0xB9, - G_SETOTHERMODE_H = 0xBA, - G_TEXTURE = 0xBB, - G_MOVEWORD = 0xBC, - G_POPMTX = 0xBD, - G_CULLDL = 0xBE, - G_TRI1 = 0xBF, - G_NOOP = 0xC0, - G_TEXRECT = 0xE4, - G_TEXRECTFLIP = 0xE5, - G_RDPLOADSYNC = 0xE6, - G_RDPPIPESYNC = 0xE7, - G_RDPTILESYNC = 0xE8, - G_RDPFULLSYNC = 0xE9, - G_SETKEYGB = 0xEA, - G_SETKEYR = 0xEB, - G_SETCONVERT = 0xEC, - G_SETSCISSOR = 0xED, - G_SETPRIMDEPTH = 0xEE, - G_RDPSETOTHERMODE = 0xEF, - G_LOADTLUT = 0xF0, - G_SETTILESIZE = 0xF2, - G_LOADBLOCK = 0xF3, - G_LOADTILE = 0xF4, - G_SETTILE = 0xF5, - G_FILLRECT = 0xF6, - G_SETFILLCOLOR = 0xF7, - G_SETFOGCOLOR = 0xF8, - G_SETBLENDCOLOR = 0xF9, - G_SETPRIMCOLOR = 0xFA, - G_SETENVCOLOR = 0xFB, - G_SETCOMBINE = 0xFC, - G_SETTIMG = 0xFD, - G_SETZIMG = 0xFE, - G_SETCIMG = 0xFF -}; - -enum class F3DZEXOpcode -{ - G_NOOP = 0x00, - G_VTX = 0x01, - G_MODIFYVTX = 0x02, - G_CULLDL = 0x03, - G_BRANCH_Z = 0x04, - G_TRI1 = 0x05, - G_TRI2 = 0x06, - G_QUAD = 0x07, - G_SPECIAL_3 = 0xD3, - G_SPECIAL_2 = 0xD4, - G_SPECIAL_1 = 0xD5, - G_DMA_IO = 0xD6, - G_TEXTURE = 0xD7, - G_POPMTX = 0xD8, - G_GEOMETRYMODE = 0xD9, - G_MTX = 0xDA, - G_MOVEWORD = 0xDB, - G_MOVEMEM = 0xDC, - G_LOAD_UCODE = 0xDD, - G_DL = 0xDE, - G_ENDDL = 0xDF, - G_SPNOOP = 0xE0, - G_RDPHALF_1 = 0xE1, - G_SETOTHERMODE_L = 0xE2, - G_SETOTHERMODE_H = 0xE3, - G_TEXRECT = 0xE4, - G_TEXRECTFLIP = 0xE5, - G_RDPLOADSYNC = 0xE6, - G_RDPPIPESYNC = 0xE7, - G_RDPTILESYNC = 0xE8, - G_RDPFULLSYNC = 0xE9, - G_SETKEYGB = 0xEA, - G_SETKEYR = 0xEB, - G_SETCONVERT = 0xEC, - G_SETSCISSOR = 0xED, - G_SETPRIMDEPTH = 0xEE, - G_RDPSETOTHERMODE = 0xEF, - G_LOADTLUT = 0xF0, - G_RDPHALF_2 = 0xF1, - G_SETTILESIZE = 0xF2, - G_LOADBLOCK = 0xF3, - G_LOADTILE = 0xF4, - G_SETTILE = 0xF5, - G_FILLRECT = 0xF6, - G_SETFILLCOLOR = 0xF7, - G_SETFOGCOLOR = 0xF8, - G_SETBLENDCOLOR = 0xF9, - G_SETPRIMCOLOR = 0xFA, - G_SETENVCOLOR = 0xFB, - G_SETCOMBINE = 0xFC, - G_SETTIMG = 0xFD, - G_SETZIMG = 0xFE, - G_SETCIMG = 0xFF, -}; - -enum class F3DZEXTexFormats -{ - G_IM_FMT_RGBA, - G_IM_FMT_YUV, - G_IM_FMT_CI, - G_IM_FMT_IA, - G_IM_FMT_I -}; - -enum class F3DZEXTexSizes -{ - G_IM_SIZ_4b, - G_IM_SIZ_8b, - G_IM_SIZ_16b, - G_IM_SIZ_32b -}; - -enum class DListType -{ - F3DZEX, - F3DEX, -}; - -enum class OoTSegments -{ - DirectReference = 0, - TitleStatic = 1, - Scene = 2, - Room = 3, - GameplayKeep = 4, - FieldDungeonKeep = 5, - Object = 6, - LinkAnimation = 7, - IconItemStatic = 8, - IconItem24Static = 9, - Unknown10 = 10, - Unknown11 = 11, - Unknown12 = 12, - IconFieldDungeonStatic = 13, - IconItemLanguageStatic = 14, - ZBuffer = 15, - FrameBuffer = 16, -}; - - -class ZDisplayList : public ZResource -{ -protected: - static TextureType TexFormatToTexType(F3DZEXTexFormats fmt, F3DZEXTexSizes siz); - - void ParseF3DZEX(F3DZEXOpcode opcode, uint64_t data, int32_t i, const std::string& prefix, - char* line); - void ParseF3DEX(F3DEXOpcode opcode, uint64_t data, const std::string& prefix, char* line); - - // Various Instruction Optimizations - bool SequenceCheck(std::vector sequence, int32_t startIndex); - int32_t OptimizationChecks(int32_t startIndex, std::string& output, const std::string& prefix); - int32_t OptimizationCheck_LoadTextureBlock(int32_t startIndex, std::string& output, - const std::string& prefix); - // int32_t OptimizationCheck_LoadMultiBlock(int32_t startIndex, std::string& output, std::string - // prefix); - - // F3DEX Specific Opcode Values - void Opcode_F3DEX_G_SETOTHERMODE_L(uint64_t data, char* line); - - // Shared Opcodes between F3DZEX and F3DEX - void Opcode_G_DL(uint64_t data, const std::string& prefix, char* line); - void Opcode_G_MODIFYVTX(uint64_t data, char* line); - void Opcode_G_CULLDL(uint64_t data, char* line); - void Opcode_G_TRI1(uint64_t data, char* line); - void Opcode_G_TRI2(uint64_t data, char* line); - void Opcode_G_MTX(uint64_t data, char* line); - void Opcode_G_VTX(uint64_t data, char* line); - void Opcode_G_TEXTURE(uint64_t data, char* line); - void Opcode_G_SETTIMG(uint64_t data, const std::string& prefix, char* line); - void Opcode_G_SETTILE(uint64_t data, char* line); - void Opcode_G_SETTILESIZE(uint64_t data, const std::string& prefix, char* line); - void Opcode_G_LOADBLOCK(uint64_t data, char* line); - void Opcode_G_SETCOMBINE(uint64_t data, char* line); - void Opcode_G_SETPRIMCOLOR(uint64_t data, char* line); - void Opcode_G_SETOTHERMODE_L(uint64_t data, char* line); - void Opcode_G_SETOTHERMODE_H(uint64_t data, char* line); - void Opcode_G_LOADTLUT(uint64_t data, const std::string& prefix, char* line); - void Opcode_G_ENDDL(const std::string& prefix, char* line); - -public: - std::vector instructions; - - int32_t lastTexWidth, lastTexHeight, lastTexAddr, lastTexSeg; - F3DZEXTexFormats lastTexFmt; - F3DZEXTexSizes lastTexSiz, lastTexSizTest, lastCISiz; - bool lastTexLoaded; - bool lastTexIsPalette; - - DListType dListType; - - std::map> vertices; - std::vector otherDLists; - - ZTexture* lastTexture = nullptr; - ZTexture* lastTlut = nullptr; - - std::vector references; - std::vector mtxList; - - ZDisplayList(ZFile* nParent); - ~ZDisplayList(); - - void ExtractFromXML(tinyxml2::XMLElement* reader, uint32_t nRawDataIndex) override; - void ExtractFromBinary(uint32_t nRawDataIndex, int32_t rawDataSize); - - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetDefaultName(const std::string& prefix) const override; - - void TextureGenCheck(); - static bool TextureGenCheck(int32_t texWidth, int32_t texHeight, uint32_t texAddr, - uint32_t texSeg, F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, - bool texLoaded, bool texIsPalette, ZDisplayList* self); - static int32_t GetDListLength(const std::vector& rawData, uint32_t rawDataIndex, - DListType dListType); - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - void DeclareReferences(const std::string& prefix) override; - std::string ProcessLegacy(const std::string& prefix); - std::string ProcessGfxDis(const std::string& prefix); - - bool IsExternalResource() const override; - std::string GetExternalExtension() const override; - std::string GetSourceTypeName() const override; - - ZResourceType GetResourceType() const override; - -protected: - size_t numInstructions; -}; diff --git a/ZAPDTR/ZAPD/ZFile.cpp b/ZAPDTR/ZAPD/ZFile.cpp deleted file mode 100644 index 04032e575..000000000 --- a/ZAPDTR/ZAPD/ZFile.cpp +++ /dev/null @@ -1,1429 +0,0 @@ -#include "ZFile.h" - -#include -#include -#include -#include - -#include "Globals.h" -#include "OutputFormatter.h" -#include "Utils/BinaryWriter.h" -#include "Utils/BitConverter.h" -#include "Utils/Directory.h" -#include -#include "Utils/MemoryStream.h" -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZAnimation.h" -#include "ZArray.h" -#include "ZBackground.h" -#include "ZBlob.h" -#include "ZCollision.h" -#include "ZCutscene.h" -#include "ZDisplayList.h" -#include "ZLimb.h" -#include "ZMtx.h" -#include "ZRoom/ZRoom.h" -#include "ZScalar.h" -#include "ZSkeleton.h" -#include "ZSymbol.h" -#include "ZTexture.h" -#include "ZVector.h" -#include "ZVtx.h" - -ZFile::ZFile() -{ - resources = std::vector(); - basePath = ""; - declarations = std::map(); - defines = ""; - baseAddress = 0; - rangeStart = 0x000000000; - rangeEnd = 0xFFFFFFFF; - workerID = 0; -} - -ZFile::ZFile(const fs::path& nOutPath, const std::string& nName) : ZFile() -{ - name = nName; - outName = nName; - outputPath = nOutPath; -} - -ZFile::ZFile(ZFileMode nMode, tinyxml2::XMLElement* reader, const fs::path& nBasePath, - const fs::path& nOutPath, const std::string& filename, const fs::path& nXmlFilePath, int nWorkerID) - : ZFile() -{ - xmlFilePath = nXmlFilePath; - if (nBasePath == "") - basePath = Directory::GetCurrentDirectory(); - else - basePath = nBasePath; - - if (nOutPath == "") - outputPath = Directory::GetCurrentDirectory(); - else - outputPath = nOutPath; - - mode = nMode; - workerID = nWorkerID; - - ParseXML(reader, filename); - if (mode != ZFileMode::ExternalFile) - DeclareResourceSubReferences(); -} - -ZFile::~ZFile() -{ - for (ZResource* res : resources) - delete res; - - for (auto d : declarations) - delete d.second; - - for (auto sym : symbolResources) - delete sym.second; -} - -void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename) -{ - assert(mode != ZFileMode::Invalid); - - if (filename == "") - name = reader->Attribute("Name"); - else - name = filename; - - outName = name; - const char* outNameXml = reader->Attribute("OutName"); - if (outNameXml != nullptr) - outName = outNameXml; - - // TODO: This should be a variable on the ZFile, but it is a large change in order to force all - // ZResource types to have a parent ZFile. - const char* gameStr = reader->Attribute("Game"); - if (reader->Attribute("Game") != nullptr) - { - if (std::string_view(gameStr) == "MM") - Globals::Instance->game = ZGame::MM_RETAIL; - else if (std::string_view(gameStr) == "SW97" || std::string_view(gameStr) == "OOTSW97") - Globals::Instance->game = ZGame::OOT_SW97; - else if (std::string_view(gameStr) == "OOT") - Globals::Instance->game = ZGame::OOT_RETAIL; - else - { - std::string errorHeader = - StringHelper::Sprintf("'Game' type '%s' is not supported.", gameStr); - HANDLE_ERROR_PROCESS(WarningType::InvalidAttributeValue, errorHeader, ""); - } - } - - if (reader->Attribute("BaseAddress") != nullptr) - baseAddress = StringHelper::StrToL(reader->Attribute("BaseAddress"), 16); - - if (reader->Attribute("RangeStart") != nullptr) - rangeStart = StringHelper::StrToL(reader->Attribute("RangeStart"), 16); - - if (reader->Attribute("RangeEnd") != nullptr) - rangeEnd = StringHelper::StrToL(reader->Attribute("RangeEnd"), 16); - - if (reader->Attribute("Compilable") != nullptr) - isCompilable = true; - - if (rangeStart > rangeEnd) - HANDLE_ERROR_PROCESS( - WarningType::Always, - StringHelper::Sprintf("'RangeStart' 0x%06X must be before 'RangeEnd' 0x%06X", - rangeStart, rangeEnd), - ""); - - const char* segmentXml = reader->Attribute("Segment"); - if (segmentXml != nullptr) - { - if (!StringHelper::HasOnlyDigits(segmentXml)) - { - HANDLE_ERROR_PROCESS(WarningType::Always, - StringHelper::Sprintf("error: Invalid segment value '%s': must be " - "a decimal between 0 and 15 inclusive", - segmentXml), - ""); - } - - segment = StringHelper::StrToL(segmentXml, 10); - if (segment > 15) - { - if (segment == 128) - { -#ifdef DEPRECATION_ON - HANDLE_WARNING_PROCESS( - WarningType::Always, "warning: segment 128 is deprecated.", - "Remove 'Segment=\"128\"' from the xml to use virtual addresses\n"); -#endif - } - else - { - HANDLE_ERROR_PROCESS( - WarningType::Always, - StringHelper::Sprintf("error: invalid segment value '%s': must be a decimal " - "number between 0 and 15 inclusive", - segmentXml), - ""); - } - } - } - Globals::Instance->AddSegment(segment, this, workerID); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - { - if (segment == 0x80) - { - printf("File '%s' using virtual addresses.\n", GetName().c_str()); - } - else - { - printf("File '%s' using segment %X.\n", GetName().c_str(), segment); - } - } - - if (mode == ZFileMode::Extract || mode == ZFileMode::ExternalFile || mode == ZFileMode::ExtractDirectory) - { - if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory) - { - if (!DiskFile::Exists((basePath / name).string())) - { - std::string errorHeader = StringHelper::Sprintf("binary file '%s' does not exist.", - (basePath / name).c_str()); - HANDLE_ERROR_PROCESS(WarningType::Always, errorHeader, ""); - } - } - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - rawData = Globals::Instance->GetBaseromFile(name); - else - rawData = Globals::Instance->GetBaseromFile((basePath / name).string()); - - if (reader->Attribute("RangeEnd") == nullptr) - rangeEnd = rawData.size(); - } - - std::unordered_set nameSet; - std::unordered_set outNameSet; - std::unordered_set offsetSet; - - auto nodeMap = *GetNodeMap(); - uint32_t rawDataIndex = 0; - - for (tinyxml2::XMLElement* child = reader->FirstChildElement(); child != nullptr; - child = child->NextSiblingElement()) - { - const char* nameXml = child->Attribute("Name"); - const char* outNameXml = child->Attribute("OutName"); - const char* offsetXml = child->Attribute("Offset"); - - // Check for repeated attributes. - if (offsetXml != nullptr) - { - if (!StringHelper::IsValidOffset(std::string_view(offsetXml))) - { - HANDLE_ERROR(WarningType::InvalidXML, - StringHelper::Sprintf("Invalid offset %s entered", offsetXml), ""); - } - rawDataIndex = strtol(offsetXml, NULL, 16); - - if (offsetSet.find(offsetXml) != offsetSet.end()) - { - std::string errorHeader = - StringHelper::Sprintf("repeated 'Offset' attribute: %s", offsetXml); - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - offsetSet.insert(offsetXml); - } - else - { - HANDLE_WARNING_RESOURCE(WarningType::MissingOffsets, this, nullptr, rawDataIndex, - StringHelper::Sprintf("no offset specified for %s.", nameXml), - ""); - } - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - printf("%s: 0x%06X\n", nameXml, rawDataIndex); - - if (outNameXml != nullptr) - { - if (outNameSet.find(outNameXml) != outNameSet.end()) - { - std::string errorHeader = - StringHelper::Sprintf("repeated 'OutName' attribute: %s", outNameXml); - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - outNameSet.insert(outNameXml); - } - if (nameXml != nullptr) - { - if (nameSet.find(nameXml) != nameSet.end()) - { - std::string errorHeader = - StringHelper::Sprintf("repeated 'Name' attribute: %s", nameXml); - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - nameSet.insert(nameXml); - } - - std::string nodeName = std::string(child->Name()); - - if (nodeMap.find(nodeName) != nodeMap.end()) - { - ZResource* nRes = nodeMap[nodeName](this); - - if (mode == ZFileMode::Extract || mode == ZFileMode::ExternalFile || - mode == ZFileMode::ExtractDirectory) - { - if (!isCompilable) - nRes->ExtractFromXML(child, rawDataIndex); - } - switch (nRes->GetResourceType()) - { - case ZResourceType::Texture: - AddTextureResource(rawDataIndex, static_cast(nRes)); - break; - - case ZResourceType::Symbol: - AddSymbolResource(rawDataIndex, static_cast(nRes)); - break; - - default: - AddResource(nRes); - break; - } - - rawDataIndex += nRes->GetRawDataSize(); - } - else if (std::string_view(child->Name()) == "File") - { - std::string errorHeader = "Can't declare a inside a "; - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - else - { - std::string errorHeader = StringHelper::Sprintf( - "Unknown element found inside a element: %s", nodeName.c_str()); - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - } -} - -void ZFile::DeclareResourceSubReferences() -{ - for (size_t i = 0; i < resources.size(); i++) - { - resources.at(i)->DeclareReferences(name); - } -} - -void ZFile::BuildSourceFile() -{ - if (mode == ZFileMode::ExternalFile) - return; - - if (!Directory::Exists(outputPath)) - Directory::CreateDirectory(outputPath.string()); - - GenerateSourceFiles(); -} - -std::string ZFile::GetName() const -{ - return name; -} - -std::string ZFile::GetOutName() const -{ - return outName.string(); -} - -ZFileMode ZFile::GetMode() const -{ - return mode; -} - -const fs::path& ZFile::GetXmlFilePath() const -{ - return xmlFilePath; -} - -const std::vector& ZFile::GetRawData() const -{ - return rawData; -} - -void ZFile::ExtractResources() -{ - if (mode == ZFileMode::ExternalFile) - return; - - if (!Directory::Exists(outputPath)) - Directory::CreateDirectory(outputPath.string()); - - if (!Directory::Exists(GetSourceOutputFolderPath())) - Directory::CreateDirectory(GetSourceOutputFolderPath().string()); - - for (size_t i = 0; i < resources.size(); i++) - resources[i]->ParseRawDataLate(); - for (size_t i = 0; i < resources.size(); i++) - resources[i]->DeclareReferencesLate(name); - - if (Globals::Instance->genSourceFile) - GenerateSourceFiles(); - - auto memStreamFile = std::shared_ptr(new MemoryStream()); - BinaryWriter writerFile = BinaryWriter(memStreamFile); - - ExporterSet* exporterSet = Globals::Instance->GetExporterSet(); - - if (exporterSet != nullptr && exporterSet->beginFileFunc != nullptr) - exporterSet->beginFileFunc(this); - - int totalMs = 0; - - for (ZResource* res : resources) - { - auto start = std::chrono::steady_clock::now(); - - auto memStreamRes = std::shared_ptr(new MemoryStream()); - BinaryWriter writerRes = BinaryWriter(memStreamRes); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - printf("Saving resource %s\n", res->GetName().c_str()); - - res->Save(outputPath); - - // Check if we have an exporter "registered" for this resource type - ZResourceExporter* exporter = Globals::Instance->GetExporter(res->GetResourceType()); - if (exporter != nullptr) - { - // exporter->Save(res, Globals::Instance->outputPath.string(), &writerFile); - exporter->Save(res, Globals::Instance->outputPath.string(), &writerRes); - } - - if (exporterSet != nullptr && exporterSet->resSaveFunc != nullptr) - exporterSet->resSaveFunc(res, writerRes); - - auto end = std::chrono::steady_clock::now(); - auto diff = std::chrono::duration_cast(end - start).count(); - - totalMs += diff; - - //printf("Res %s in %lims\n", res->GetName().c_str(), diff); - } - - //printf("File %s in %lims\n", GetName().c_str(), totalMs); - - if (memStreamFile->GetLength() > 0) - { - DiskFile::WriteAllBytes(StringHelper::Sprintf("%s%s.bin", - Globals::Instance->outputPath.string().c_str(), - GetName().c_str()), - memStreamFile->ToVector()); - } - - writerFile.Close(); - - if (exporterSet != nullptr && exporterSet->endFileFunc != nullptr) - exporterSet->endFileFunc(this); -} - -void ZFile::AddResource(ZResource* res) -{ - resources.push_back(res); -} - -ZResource* ZFile::FindResource(offset_t rawDataIndex) -{ - for (ZResource* res : resources) - { - if (res->GetRawDataIndex() == rawDataIndex) - return res; - } - - return nullptr; -} - -std::vector ZFile::GetResourcesOfType(ZResourceType resType) -{ - std::vector resList; - resList.reserve(resources.size()); - - for (ZResource* res : resources) - { - if (res->GetResourceType() == resType) - resList.push_back(res); - } - - return resList; -} - -Declaration* ZFile::AddDeclaration(offset_t address, DeclarationAlignment alignment, size_t size, - const std::string& varType, const std::string& varName, - const std::string& body) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - Declaration* decl = GetDeclaration(address); - if (decl == nullptr) - { - decl = new Declaration(address, alignment, size, varType, varName, false, body); - declarations[address] = decl; - } - else - { - decl->alignment = alignment; - decl->size = size; - decl->varType = varType; - decl->varName = varName; - decl->text = body; - } - return decl; -} - -Declaration* ZFile::AddDeclarationArray(offset_t address, DeclarationAlignment alignment, - size_t size, const std::string& varType, - const std::string& varName, size_t arrayItemCnt, - const std::string& body) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - Declaration* decl = GetDeclaration(address); - if (decl == nullptr) - { - decl = - new Declaration(address, alignment, size, varType, varName, true, arrayItemCnt, body); - declarations[address] = decl; - } - else - { - if (decl->isPlaceholder) - decl->varName = varName; - decl->alignment = alignment; - decl->size = size; - decl->varType = varType; - decl->isArray = true; - decl->arrayItemCnt = arrayItemCnt; - decl->text = body; - } - - return decl; -} - -Declaration* ZFile::AddDeclarationArray(offset_t address, DeclarationAlignment alignment, - size_t size, const std::string& varType, - const std::string& varName, - const std::string& arrayItemCntStr, const std::string& body) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - Declaration* decl = GetDeclaration(address); - if (decl == nullptr) - { - decl = new Declaration(address, alignment, size, varType, varName, true, arrayItemCntStr, - body); - declarations[address] = decl; - } - else - { - decl->alignment = alignment; - decl->size = size; - decl->varType = varType; - decl->varName = varName; - decl->isArray = true; - decl->arrayItemCntStr = arrayItemCntStr; - decl->text = body; - } - return decl; -} - -Declaration* ZFile::AddDeclarationPlaceholder(offset_t address, const std::string& varName) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - Declaration* decl; - if (declarations.find(address) == declarations.end()) - { - decl = new Declaration(address, DeclarationAlignment::Align4, 0, "", varName, false, ""); - decl->isPlaceholder = true; - declarations[address] = decl; - } - else - decl = declarations[address]; - - return decl; -} - -Declaration* ZFile::AddDeclarationInclude(offset_t address, const std::string& includePath, - size_t size, const std::string& varType, - const std::string& varName) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - Declaration* decl = GetDeclaration(address); - if (decl == nullptr) - { - decl = new Declaration(address, includePath, size, varType, varName); - declarations[address] = decl; - } - else - { - decl->includePath = includePath; - decl->size = size; - decl->varType = varType; - decl->varName = varName; - } - return decl; -} - -Declaration* ZFile::AddDeclarationIncludeArray(offset_t address, std::string& includePath, - size_t size, const std::string& varType, - const std::string& varName, size_t arrayItemCnt) -{ - bool validOffset = AddDeclarationChecks(address, varName); - if (!validOffset) - return nullptr; - - if (StringHelper::StartsWith(includePath, "assets/extracted/")) - includePath = "assets/" + StringHelper::Split(includePath, "assets/extracted/")[1]; - if (StringHelper::StartsWith(includePath, "assets/custom/")) - includePath = "assets/" + StringHelper::Split(includePath, "assets/custom/")[1]; - - Declaration* decl = GetDeclaration(address); - if (decl == nullptr) - { - decl = new Declaration(address, includePath, size, varType, varName); - - decl->isArray = true; - decl->arrayItemCnt = arrayItemCnt; - - declarations[address] = decl; - } - else - { - decl->includePath = includePath; - decl->varType = varType; - decl->varName = varName; - decl->size = size; - decl->isArray = true; - decl->arrayItemCnt = arrayItemCnt; - } - return decl; -} - -bool ZFile::AddDeclarationChecks(uint32_t address, const std::string& varName) -{ - assert(GETSEGNUM(address) == 0); - assert(varName != ""); -#ifdef DEVELOPMENT - if (address == 0x0000) - { - [[maybe_unused]] int32_t bp = 0; - } -#endif - - if (!IsOffsetInFileRange(address)) - { - fprintf(stderr, - "%s: Warning in %s\n" - "\t Tried to declare a variable outside of this file's range. Ignoring...\n" - "\t\t Variable's name: %s\n" - "\t\t Variable's offset: 0x%06X\n", - __PRETTY_FUNCTION__, name.c_str(), varName.c_str(), address); - return false; - } - - return true; -} - -bool ZFile::GetDeclarationPtrName(segptr_t segAddress, const std::string& expectedType, - std::string& declName) const -{ - if (segAddress == 0) - { - declName = "NULL"; - return true; - } - - uint32_t offset = Seg2Filespace(segAddress, baseAddress); - Declaration* decl = GetDeclaration(offset); - if (GETSEGNUM(segAddress) != segment || decl == nullptr) - { - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; - } - - if (expectedType != "" && expectedType != "void*") - { - if (expectedType != decl->varType && "static " + expectedType != decl->varType) - { - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; - } - } - - if (!decl->isArray) - declName = "&" + decl->varName; - else - declName = decl->varName; - return true; -} - -bool ZFile::GetDeclarationArrayIndexedName(segptr_t segAddress, size_t elementSize, - const std::string& expectedType, - std::string& declName) const -{ - if (segAddress == 0) - { - declName = "NULL"; - return true; - } - - uint32_t address = Seg2Filespace(segAddress, baseAddress); - Declaration* decl = GetDeclarationRanged(address); - if (GETSEGNUM(segAddress) != segment || decl == nullptr || !decl->isArray) - { - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; - } - - if (expectedType != "" && expectedType != "void*") - { - if (expectedType != decl->varType && "static " + expectedType != decl->varType) - { - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; - } - } - - if (decl->address == address) - { - declName = decl->varName; - return true; - } - - if ((address - decl->address) % elementSize != 0 || !(address < decl->address + decl->size)) - { - declName = StringHelper::Sprintf("0x%08X", segAddress); - return false; - } - - uint32_t index = (address - decl->address) / elementSize; - declName = StringHelper::Sprintf("&%s[%u]", decl->varName.c_str(), index); - return true; -} - -Declaration* ZFile::GetDeclaration(offset_t address) const -{ - if (declarations.find(address) != declarations.end()) - return declarations.at(address); - - return nullptr; -} - -Declaration* ZFile::GetDeclarationRanged(offset_t address) const -{ - for (const auto decl : declarations) - { - if (address >= decl.first && address < decl.first + decl.second->size) - return decl.second; - } - - return nullptr; -} - -bool ZFile::HasDeclaration(offset_t address) -{ - assert(GETSEGNUM(address) == 0); - return declarations.find(address) != declarations.end(); -} - -void ZFile::GenerateSourceFiles() -{ - std::string sourceOutput; - - sourceOutput += "#include \"ultra64.h\"\n"; - sourceOutput += "#include \"z64.h\"\n"; - sourceOutput += "#include \"macros.h\"\n"; - sourceOutput += GetHeaderInclude(); - - bool hasZRoom = false; - for (const auto& res : resources) - { - ZResourceType resType = res->GetResourceType(); - if (resType == ZResourceType::Room || resType == ZResourceType::Scene || - resType == ZResourceType::AltHeader) - { - hasZRoom = true; - break; - } - } - - if (hasZRoom) - { - sourceOutput += GetZRoomHeaderInclude(); - } - - sourceOutput += GetExternalFileHeaderInclude(); - - GeneratePlaceholderDeclarations(); - - // Generate Code - for (size_t i = 0; i < resources.size(); i++) - { - ZResource* res = resources.at(i); - res->GetSourceOutputCode(name); - } - - sourceOutput += ProcessDeclarations(); - - fs::path outPath = GetSourceOutputFolderPath() / outName.stem().concat(".c"); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - printf("Writing C file: %s\n", outPath.c_str()); - - if (!Globals::Instance->otrMode) - { - OutputFormatter formatter; - formatter.Write(sourceOutput); - - DiskFile::WriteAllText(outPath, formatter.GetOutput()); - } - - GenerateSourceHeaderFiles(); -} - -void ZFile::GenerateSourceHeaderFiles() -{ - OutputFormatter formatter; - // Use parent folder and output name as guard as some headers have the same output name - std::string guard = xmlFilePath.parent_path().stem().string() + "_" + outName.stem().string(); - - std::transform(guard.begin(), guard.end(), guard.begin(), ::toupper); - formatter.Write( - StringHelper::Sprintf("#ifndef %s_H\n#define %s_H 1\n\n", guard.c_str(), guard.c_str())); - formatter.Write("#include \"align_asset_macro.h\"\n"); - - std::set nameSet; - for (ZResource* res : resources) - { - std::string resSrc = res->GetSourceOutputHeader("", &nameSet); - if (!resSrc.empty()) - { - formatter.Write(resSrc.front() == '\n' ? resSrc : "\n" + resSrc); - formatter.Write(res == resources.back() ? "" : "\n"); - } - } - - for (auto& sym : symbolResources) - { - formatter.Write("\n\n"); - formatter.Write(sym.second->GetSourceOutputHeader("", &nameSet)); - } - - formatter.Write(ProcessExterns()); - - formatter.Write(StringHelper::Sprintf("\n#endif // %s_H\n", guard.c_str())); - - fs::path headerFilename = GetSourceOutputFolderPath() / outName.stem().concat(".h"); - - if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_INFO) - printf("Writing H file: %s\n", headerFilename.c_str()); - - std::string output = formatter.GetOutput(); - - if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory) - DiskFile::WriteAllText(headerFilename, output); - else if (Globals::Instance->sourceOutputPath != "") - { - std::string xmlPath = xmlFilePath.string(); - xmlPath = StringHelper::Replace(xmlPath, "\\", "/"); - auto pathList = StringHelper::Split(xmlPath, "/"); - std::string outPath = ""; - - for (int i = 0; i < 3; i++) - outPath += pathList[i] + "/"; - - for (int i = 5; i < pathList.size(); i++) - { - if (i == pathList.size() - 1) - { - outPath += Path::GetFileNameWithoutExtension(pathList[i]) + "/"; - outPath += outName.string() + ".h"; - } - else - outPath += pathList[i]; - - if (i < pathList.size() - 1) - outPath += "/"; - } - - DiskFile::WriteAllText(outPath, output); - } -} - -std::string ZFile::GetHeaderInclude() const -{ - std::string headers = StringHelper::Sprintf("#include \"%s.h\"\n", - (outName.parent_path() / outName.stem()).string().c_str()); - - return headers; -} - -std::string ZFile::GetZRoomHeaderInclude() const -{ - std::string headers; - headers += "#include \"segment_symbols.h\"\n"; - headers += "#include \"command_macros_base.h\"\n"; - headers += "#include \"z64cutscene_commands.h\"\n"; - headers += "#include \"variables.h\"\n"; - return headers; -} - -std::string ZFile::GetExternalFileHeaderInclude() const -{ - std::string externalFilesIncludes = ""; - - for (ZFile* externalFile : Globals::Instance->files) - { - if (externalFile != this) - { - fs::path outputFolderPath = externalFile->GetSourceOutputFolderPath(); - if (outputFolderPath == this->GetSourceOutputFolderPath()) - { - outputFolderPath = externalFile->outName.stem(); - } - else - { - outputFolderPath /= externalFile->outName.stem(); - } - - externalFilesIncludes += - StringHelper::Sprintf("#include \"%s.h\"\n", outputFolderPath.string().c_str()); - } - } - - return externalFilesIncludes; -} - -void ZFile::GeneratePlaceholderDeclarations() -{ - // Generate placeholder declarations - for (ZResource* res : resources) - { - if (GetDeclaration(res->GetRawDataIndex()) != nullptr) - { - continue; - } - - Declaration* decl = res->DeclareVar(GetName(), ""); - - if (decl != nullptr) - { - decl->staticConf = res->GetStaticConf(); - if (res->GetResourceType() == ZResourceType::Symbol) - { - decl->staticConf = StaticConfig::Off; - } - } - } -} - -void ZFile::AddTextureResource(uint32_t offset, ZTexture* tex) -{ - for (auto res : resources) - assert(res->GetRawDataIndex() != offset); - - resources.push_back(tex); - texturesResources[offset] = tex; -} - -ZTexture* ZFile::GetTextureResource(uint32_t offset) const -{ - auto tex = texturesResources.find(offset); - if (tex != texturesResources.end()) - return tex->second; - - return nullptr; -} - -void ZFile::AddSymbolResource(uint32_t offset, ZSymbol* sym) -{ - symbolResources[offset] = sym; -} - -ZSymbol* ZFile::GetSymbolResource(uint32_t offset) const -{ - auto sym = symbolResources.find(offset); - if (sym != symbolResources.end()) - return sym->second; - - return nullptr; -} - -ZSymbol* ZFile::GetSymbolResourceRanged(uint32_t offset) const -{ - for (const auto decl : symbolResources) - { - if (offset >= decl.first && offset < decl.first + decl.second->GetRawDataSize()) - return decl.second; - } - - return nullptr; -} - -fs::path ZFile::GetSourceOutputFolderPath() const -{ - return outputPath / outName.parent_path(); -} - -bool ZFile::IsOffsetInFileRange(uint32_t offset) const -{ - if (!(offset < rawData.size())) - return false; - - return rangeStart <= offset && offset < rangeEnd; -} -bool ZFile::IsSegmentedInFilespaceRange(segptr_t segAddress) const -{ - uint8_t segnum = GETSEGNUM(segAddress); - uint32_t offset = Seg2Filespace(segAddress, baseAddress); - - if (segment != segnum) - return false; - - return IsOffsetInFileRange(offset); -} - -std::map* ZFile::GetNodeMap() -{ - static std::map nodeMap; - return &nodeMap; -} - -void ZFile::RegisterNode(std::string nodeName, ZResourceFactoryFunc* nodeFunc) -{ - std::map* nodeMap = GetNodeMap(); - (*nodeMap)[nodeName] = nodeFunc; -} - -std::string ZFile::ProcessDeclarations() -{ - std::string output; - - if (declarations.size() == 0) - return output; - - defines += ProcessTextureIntersections(name); - - // printf("RANGE START: 0x%06X - RANGE END: 0x%06X\n", rangeStart, rangeEnd); - - // Optimization: See if there are any arrays side by side that can be merged... - std::vector> declarationKeys(declarations.begin(), - declarations.end()); - - std::pair lastItem = declarationKeys.at(0); - - for (size_t i = 1; i < declarationKeys.size(); i++) - { - std::pair curItem = declarationKeys[i]; - - if (curItem.second->isArray && lastItem.second->isArray) - { - if (curItem.second->varType == lastItem.second->varType) - { - if (!curItem.second->declaredInXml && !lastItem.second->declaredInXml) - { - // TEST: For now just do Vtx declarations... - if (lastItem.second->varType == "Vtx") - { - int32_t sizeDiff = curItem.first - (lastItem.first + lastItem.second->size); - - // Make sure there isn't an unaccounted inbetween these two - if (sizeDiff == 0) - { - lastItem.second->size += curItem.second->size; - lastItem.second->arrayItemCnt += curItem.second->arrayItemCnt; - lastItem.second->text += "\n" + curItem.second->text; - - for (auto vtx : curItem.second->vertexHack) - lastItem.second->vertexHack.push_back(vtx); - - declarations.erase(curItem.first); - declarationKeys.erase(declarationKeys.begin() + i); - delete curItem.second; - i--; - continue; - } - } - } - } - } - - lastItem = curItem; - } - - for (std::pair item : declarations) - ProcessDeclarationText(item.second); - - for (std::pair item : declarations) - { - while (item.second->size % 4 != 0) - item.second->size++; - } - - HandleUnaccountedData(); - - // Go through include declarations - // First, handle the prototypes (static only for now) - for (std::pair item : declarations) - { - output += item.second->GetStaticForwardDeclarationStr(); - } - - output += "\n"; - - // Next, output the actual declarations - for (const auto& item : declarations) - { - if (!IsOffsetInFileRange(item.first)) - continue; - - if (item.second->includePath != "") - { - if (item.second->isExternal) - { - if (!Globals::Instance->otrMode) - { - // HACK - std::string extType; - - if (item.second->varType == "Gfx") - extType = "dlist"; - else if (item.second->varType == "Vtx") - extType = "vtx"; - - auto filepath = outputPath / item.second->varName; - DiskFile::WriteAllText( - StringHelper::Sprintf("%s.%s.inc", filepath.string().c_str(), extType.c_str()), - item.second->text); - } - } - - output += item.second->GetExternalDeclarationStr(); - } - else if (item.second->varType != "") - { - output += item.second->GetNormalDeclarationStr(); - } - } - - return output; -} - -void ZFile::ProcessDeclarationText(Declaration* decl) -{ - size_t refIndex = 0; - - if (!(decl->references.size() > 0)) - return; - - for (size_t i = 0; i < decl->text.size() - 1; i++) - { - char c = decl->text[i]; - char c2 = decl->text[i + 1]; - - if (c == '@' && c2 == 'r') - { - std::string vtxName; - Globals::Instance->GetSegmentedArrayIndexedName(decl->references[refIndex], 0x10, this, - "Vtx", vtxName, workerID); - decl->text.replace(i, 2, vtxName); - - refIndex++; - - if (refIndex >= decl->references.size()) - break; - } - } -} - -std::string ZFile::ProcessExterns() -{ - std::string output; - - for (const auto& item : declarations) - { - if (!IsOffsetInFileRange(item.first)) - { - continue; - } - - output += item.second->GetExternStr(); - } - - output += "\n"; - - output += defines; - - return output; -} - -std::string ZFile::ProcessTextureIntersections([[maybe_unused]] const std::string& prefix) -{ - if (texturesResources.empty()) - return ""; - - std::string defines; - std::vector> texturesSorted(texturesResources.begin(), - texturesResources.end()); - - for (size_t i = 0; i < texturesSorted.size() - 1; i++) - { - uint32_t currentOffset = texturesSorted[i].first; - uint32_t nextOffset = texturesSorted[i + 1].first; - auto& currentTex = texturesResources.at(currentOffset); - int texSize = currentTex->GetRawDataSize(); - - if (currentTex->WasDeclaredInXml()) - { - // We believe the user is right. - continue; - } - - if ((currentOffset + texSize) > nextOffset) - { - uint32_t offsetDiff = nextOffset - currentOffset; - if (currentTex->isPalette) - { - // Shrink palette so it doesn't overlap - currentTex->SetDimensions(offsetDiff / currentTex->GetPixelMultiplyer(), 1); - - if (declarations.find(currentOffset) != declarations.end()) - declarations.at(currentOffset)->size = currentTex->GetRawDataSize(); - - currentTex->DeclareVar(GetName(), ""); - } - else - { - std::string texName; - std::string texNextName; - GetDeclarationPtrName(currentOffset, "", texName); - - Declaration* nextDecl = GetDeclaration(nextOffset); - if (nextDecl == nullptr) - texNextName = texturesResources.at(nextOffset)->GetName(); - else - texNextName = nextDecl->varName; - -#if 0 - defines += StringHelper::Sprintf("#define %s ((u32)%s + 0x%06X)\n", - texNextName.c_str(), texName.c_str(), offsetDiff); -#endif - - delete declarations[nextOffset]; - declarations.erase(nextOffset); - texturesResources.erase(nextOffset); - texturesSorted.erase(texturesSorted.begin() + i + 1); - - i--; - } - } - } - - return defines; -} - -void ZFile::HandleUnaccountedData() -{ - uint32_t lastAddr = 0; - uint32_t lastSize = 0; - std::vector declsAddresses; - - if (Globals::Instance->otrMode) - return; - - declsAddresses.reserve(declarations.size()); - if (Globals::Instance->otrMode) - return; - - for (const auto& item : declarations) - { - declsAddresses.push_back(item.first); - } - - bool breakLoop = false; - for (offset_t currentAddress : declsAddresses) - { - if (currentAddress >= rangeEnd) - { - breakLoop = true; - break; - } - - if (currentAddress < rangeStart) - { - lastAddr = currentAddress; - continue; - } - - breakLoop = HandleUnaccountedAddress(currentAddress, lastAddr, lastSize); - if (breakLoop) - break; - - lastAddr = currentAddress; - } - - if (!breakLoop) - { - // TODO: change rawData.size() to rangeEnd - // HandleUnaccountedAddress(rangeEnd, lastAddr, lastSize); - HandleUnaccountedAddress(rawData.size(), lastAddr, lastSize); - } -} - -bool ZFile::HandleUnaccountedAddress(offset_t currentAddress, offset_t lastAddr, uint32_t& lastSize) -{ - if (currentAddress != lastAddr && declarations.find(lastAddr) != declarations.end()) - { - Declaration* lastDecl = declarations.at(lastAddr); - lastSize = lastDecl->size; - - if (lastAddr + lastSize > currentAddress) - { - Declaration* currentDecl = declarations.at(currentAddress); - - std::string intersectionInfo = StringHelper::Sprintf( - "Resource from 0x%06X:0x%06X (%s) conflicts with 0x%06X (%s).", lastAddr, - lastAddr + lastSize, lastDecl->varName.c_str(), currentAddress, - currentDecl->varName.c_str()); - HANDLE_WARNING_RESOURCE(WarningType::Intersection, this, nullptr, currentAddress, - "intersection detected", intersectionInfo); - } - } - - uint32_t unaccountedAddress = lastAddr + lastSize; - - if (unaccountedAddress != currentAddress && lastAddr >= rangeStart && - unaccountedAddress < rangeEnd) - { - int diff = currentAddress - unaccountedAddress; - bool nonZeroUnaccounted = false; - - std::string src = " "; - - if (currentAddress > rawData.size()) - { - throw std::runtime_error(StringHelper::Sprintf( - "ZFile::ProcessDeclarations(): Fatal error while processing XML '%s'.\n" - "\t Offset '0x%X' is outside of the limits of file '%s', which has a size of " - "'0x%X'.\n" - "\t Aborting...", - xmlFilePath.c_str(), currentAddress, name.c_str(), rawData.size())); - } - - // Handle Align8 - if (currentAddress % 8 == 0 && diff % 8 != 0) - { - Declaration* currentDecl = GetDeclaration(currentAddress); - - if (currentDecl != nullptr) - { - if (currentDecl->alignment == DeclarationAlignment::Align8) - { - // Check removed bytes are zeroes - if (BitConverter::ToUInt32BE(rawData, unaccountedAddress + diff - 4) == 0) - { - diff -= 4; - } - } - - if (diff == 0) - { - return false; - } - } - } - - for (int i = 0; i < diff; i++) - { - uint8_t val = rawData.at(unaccountedAddress + i); - src += StringHelper::Sprintf("0x%02X, ", val); - if (val != 0x00) - { - nonZeroUnaccounted = true; - } - - if (Globals::Instance->verboseUnaccounted) - { - if ((i % 4 == 3)) - { - src += StringHelper::Sprintf(" // 0x%06X", unaccountedAddress + i - 3); - if (i != (diff - 1)) - { - src += "\n\t"; - } - } - } - else - { - if ((i % 16 == 15) && (i != (diff - 1))) - src += "\n "; - } - } - - if (declarations.find(unaccountedAddress) == declarations.end() && diff > 0) - { - std::string unaccountedPrefix = "unaccounted"; - - if (diff < 16 && !nonZeroUnaccounted) - { - unaccountedPrefix = "possiblePadding"; - - // Strip unnecessary padding at the end of the file. - if (unaccountedAddress + diff >= rawData.size()) - return true; - } - - Declaration* decl = AddDeclarationArray( - unaccountedAddress, DeclarationAlignment::Align4, diff, "u8", - StringHelper::Sprintf("%s_%s_%06X", name.c_str(), unaccountedPrefix.c_str(), - unaccountedAddress), - diff, src); - - decl->isUnaccounted = true; - if (Globals::Instance->forceUnaccountedStatic) - decl->staticConf = StaticConfig::On; - - if (nonZeroUnaccounted) - { - HANDLE_WARNING_RESOURCE(WarningType::Unaccounted, this, nullptr, unaccountedAddress, - "a non-zero unaccounted block was found", - StringHelper::Sprintf("Block size: '0x%X'", diff)); - } - else if (diff >= 16) - { - HANDLE_WARNING_RESOURCE(WarningType::Unaccounted, this, nullptr, unaccountedAddress, - "a big (size>=0x10) zero-only unaccounted block was found", - StringHelper::Sprintf("Block size: '0x%X'", diff)); - } - } - } - - return false; -} diff --git a/ZAPDTR/ZAPD/ZFile.h b/ZAPDTR/ZAPD/ZFile.h deleted file mode 100644 index 04334547c..000000000 --- a/ZAPDTR/ZAPD/ZFile.h +++ /dev/null @@ -1,141 +0,0 @@ -#pragma once - -#include -#include - -#include "ZSymbol.h" -#include "ZTexture.h" -#include "tinyxml2.h" - -enum class ZFileMode -{ - BuildTexture, - BuildOverlay, - BuildBlob, - BuildSourceFile, - BuildBackground, - Extract, - ExternalFile, - ExtractDirectory, - Invalid, - Custom = 1000, // Used for exporter file modes -}; - -enum class ZGame -{ - OOT_RETAIL, - OOT_SW97, - MM_RETAIL -}; - -class ZFile -{ -public: - std::map declarations; - std::vector resources; - std::string defines; - - int workerID; - bool isCompilable = false; - - // Default to using virtual addresses - uint32_t segment = 0x80; - uint32_t baseAddress, rangeStart, rangeEnd; - bool isExternalFile = false; - - ZFile(const fs::path& nOutPath, const std::string& nName); - ZFile(ZFileMode nMode, tinyxml2::XMLElement* reader, const fs::path& nBasePath, - const fs::path& nOutPath, const std::string& filename, const fs::path& nXmlFilePath, int nWorkerID); - ~ZFile(); - - std::string GetName() const; - std::string GetOutName() const; - ZFileMode GetMode() const; - const fs::path& GetXmlFilePath() const; - const std::vector& GetRawData() const; - void ExtractResources(); - void BuildSourceFile(); - void AddResource(ZResource* res); - ZResource* FindResource(offset_t rawDataIndex); - std::vector GetResourcesOfType(ZResourceType resType); - - Declaration* AddDeclaration(offset_t address, DeclarationAlignment alignment, size_t size, - const std::string& varType, const std::string& varName, - const std::string& body); - - Declaration* AddDeclarationArray(offset_t address, DeclarationAlignment alignment, size_t size, - const std::string& varType, const std::string& varName, - size_t arrayItemCnt, const std::string& body); - Declaration* AddDeclarationArray(offset_t address, DeclarationAlignment alignment, size_t size, - const std::string& varType, const std::string& varName, - const std::string& arrayItemCntStr, const std::string& body); - - Declaration* AddDeclarationPlaceholder(offset_t address, const std::string& varName); - - Declaration* AddDeclarationInclude(offset_t address, const std::string& includePath, - size_t size, const std::string& varType, - const std::string& varName); - Declaration* AddDeclarationIncludeArray(offset_t address, std::string& includePath, size_t size, - const std::string& varType, const std::string& varName, - size_t arrayItemCnt); - - bool GetDeclarationPtrName(segptr_t segAddress, const std::string& expectedType, - std::string& declName) const; - bool GetDeclarationArrayIndexedName(segptr_t segAddress, size_t elementSize, - const std::string& expectedType, - std::string& declName) const; - - Declaration* GetDeclaration(offset_t address) const; - Declaration* GetDeclarationRanged(offset_t address) const; - bool HasDeclaration(offset_t address); - - std::string GetHeaderInclude() const; - std::string GetZRoomHeaderInclude() const; - std::string GetExternalFileHeaderInclude() const; - - void GeneratePlaceholderDeclarations(); - - void AddTextureResource(uint32_t offset, ZTexture* tex); - ZTexture* GetTextureResource(uint32_t offset) const; - - void AddSymbolResource(uint32_t offset, ZSymbol* sym); - ZSymbol* GetSymbolResource(uint32_t offset) const; - ZSymbol* GetSymbolResourceRanged(uint32_t offset) const; - - fs::path GetSourceOutputFolderPath() const; - - bool IsOffsetInFileRange(uint32_t offset) const; - bool IsSegmentedInFilespaceRange(segptr_t segAddress) const; - - static std::map* GetNodeMap(); - static void RegisterNode(std::string nodeName, ZResourceFactoryFunc* nodeFunc); - -protected: - std::string name; - fs::path outName = ""; - fs::path basePath; - fs::path outputPath; - fs::path xmlFilePath; - std::vector rawData; - - // Keep track of every texture of this ZFile. - // The pointers declared here are "borrowed" (somebody else is the owner), - // so ZFile shouldn't delete/free those textures. - std::map texturesResources; - std::map symbolResources; - ZFileMode mode = ZFileMode::Invalid; - - ZFile(); - void ParseXML(tinyxml2::XMLElement* reader, const std::string& filename); - void DeclareResourceSubReferences(); - void GenerateSourceFiles(); - void GenerateSourceHeaderFiles(); - bool AddDeclarationChecks(uint32_t address, const std::string& varName); - std::string ProcessDeclarations(); - void ProcessDeclarationText(Declaration* decl); - std::string ProcessExterns(); - - std::string ProcessTextureIntersections(const std::string& prefix); - void HandleUnaccountedData(); - bool HandleUnaccountedAddress(offset_t currentAddress, offset_t lastAddr, uint32_t& lastSize); -}; diff --git a/ZAPDTR/ZAPD/ZLimb.cpp b/ZAPDTR/ZAPD/ZLimb.cpp deleted file mode 100644 index d0c3ffe3e..000000000 --- a/ZAPDTR/ZAPD/ZLimb.cpp +++ /dev/null @@ -1,420 +0,0 @@ -#include "ZLimb.h" - -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZSkeleton.h" - -REGISTER_ZFILENODE(Limb, ZLimb); - -ZLimb::ZLimb(ZFile* nParent) : ZResource(nParent), segmentStruct(nParent) -{ - RegisterOptionalAttribute("EnumName"); - RegisterOptionalAttribute("LimbType"); - RegisterOptionalAttribute("Type"); -} - -void ZLimb::ExtractFromBinary(uint32_t nRawDataIndex, ZLimbType nType) -{ - rawDataIndex = nRawDataIndex; - type = nType; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); -} - -void ZLimb::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - auto& enumNameXml = registeredAttributes.at("EnumName").value; - if (enumNameXml != "") - { - enumName = enumNameXml; - } - - // Reading from a - std::string limbType = registeredAttributes.at("LimbType").value; - if (limbType == "") // Reading from a - limbType = registeredAttributes.at("Type").value; - - if (limbType == "") - { - HANDLE_ERROR_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - "missing 'LimbType' attribute in ", ""); - } - - type = GetTypeByAttributeName(limbType); - if (type == ZLimbType::Invalid) - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'LimbType' attribute", ""); - } -} - -void ZLimb::ParseRawData() -{ - ZResource::ParseRawData(); - const auto& rawData = parent->GetRawData(); - - if (type == ZLimbType::Curve) - { - childIndex = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0); - siblingIndex = BitConverter::ToUInt8BE(rawData, rawDataIndex + 1); - - dListPtr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); - dList2Ptr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - return; - } - if (type == ZLimbType::Legacy) - { - dListPtr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x00); - legTransX = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x04); - legTransY = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x08); - legTransZ = BitConverter::ToFloatBE(rawData, rawDataIndex + 0x0C); - rotX = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x10); - rotY = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x12); - rotZ = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x14); - childPtr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x18); - siblingPtr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x1C); - return; - } - - transX = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - transY = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - transZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - - childIndex = rawData.at(rawDataIndex + 6); - siblingIndex = rawData.at(rawDataIndex + 7); - - switch (type) - { - case ZLimbType::LOD: - dList2Ptr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 12); - [[fallthrough]]; - case ZLimbType::Standard: - dListPtr = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - break; - - case ZLimbType::Skin: - skinSegmentType = - static_cast(BitConverter::ToInt32BE(rawData, rawDataIndex + 8)); - skinSegment = BitConverter::ToUInt32BE(rawData, rawDataIndex + 12); - if (skinSegmentType == ZLimbSkinType::SkinType_4) - { - if (skinSegment != 0 && GETSEGNUM(skinSegment) == parent->segment) - { - uint32_t skinSegmentOffset = Seg2Filespace(skinSegment, parent->baseAddress); - segmentStruct.ExtractFromFile(skinSegmentOffset); - } - } - break; - - case ZLimbType::Curve: - case ZLimbType::Legacy: - break; - - case ZLimbType::Invalid: - assert(!"whoops"); - break; - } -} - -void ZLimb::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = name; - if (varPrefix == "") - varPrefix = prefix; - - ZResource::DeclareReferences(varPrefix); - - std::string suffix; - switch (type) - { - case ZLimbType::Legacy: - if (childPtr != 0 && GETSEGNUM(childPtr) == parent->segment) - { - uint32_t childOffset = Seg2Filespace(childPtr, parent->baseAddress); - if (!parent->HasDeclaration(childOffset)) - { - ZLimb* child = new ZLimb(parent); - child->ExtractFromBinary(childOffset, ZLimbType::Legacy); - child->DeclareVar(varPrefix, ""); - child->DeclareReferences(varPrefix); - parent->AddResource(child); - } - } - if (siblingPtr != 0 && GETSEGNUM(siblingPtr) == parent->segment) - { - uint32_t siblingdOffset = Seg2Filespace(siblingPtr, parent->baseAddress); - if (!parent->HasDeclaration(siblingdOffset)) - { - ZLimb* sibling = new ZLimb(parent); - sibling->ExtractFromBinary(siblingdOffset, ZLimbType::Legacy); - sibling->DeclareVar(varPrefix, ""); - sibling->DeclareReferences(varPrefix); - parent->AddResource(sibling); - } - } - break; - - case ZLimbType::Curve: - case ZLimbType::LOD: - suffix = "Far"; - if (type == ZLimbType::Curve) - suffix = "Curve2"; - DeclareDList(dList2Ptr, varPrefix, suffix); - [[fallthrough]]; - case ZLimbType::Standard: - suffix = ""; - if (type == ZLimbType::Curve) - suffix = "Curve"; - DeclareDList(dListPtr, varPrefix, suffix); - break; - - case ZLimbType::Skin: - switch (skinSegmentType) - { - case ZLimbSkinType::SkinType_4: - if (skinSegment != 0 && GETSEGNUM(skinSegment) == parent->segment) - { - segmentStruct.DeclareReferences(varPrefix); - segmentStruct.GetSourceOutputCode(varPrefix); - } - break; - - case ZLimbSkinType::SkinType_DList: - DeclareDList(skinSegment, varPrefix, ""); - break; - - default: - break; - } - break; - - case ZLimbType::Invalid: - break; - } -} - -size_t ZLimb::GetRawDataSize() const -{ - switch (type) - { - case ZLimbType::Standard: - case ZLimbType::Curve: - return 0x0C; - - case ZLimbType::LOD: - case ZLimbType::Skin: - return 0x10; - - case ZLimbType::Legacy: - return 0x20; - - case ZLimbType::Invalid: - break; - } - - return 0x0C; -} - -std::string ZLimb::GetBodySourceCode() const -{ - if (Globals::Instance->otrMode) - return ""; - - std::string dListStr; - std::string dListStr2; - Globals::Instance->GetSegmentedArrayIndexedName(dListPtr, 8, parent, "Gfx", dListStr, - parent->workerID); - Globals::Instance->GetSegmentedArrayIndexedName(dList2Ptr, 8, parent, "Gfx", dListStr2, - parent->workerID); - - std::string entryStr = "\n\t"; - if (type == ZLimbType::Legacy) - { - std::string childName; - std::string siblingName; - Globals::Instance->GetSegmentedPtrName(childPtr, parent, "LegacyLimb", childName, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(siblingPtr, parent, "LegacyLimb", siblingName, - parent->workerID); - - entryStr += StringHelper::Sprintf("%s,\n", dListStr.c_str()); - entryStr += - StringHelper::Sprintf("\t{ %ff, %ff, %ff },\n", legTransX, legTransY, legTransZ); - entryStr += StringHelper::Sprintf("\t{ 0x%04X, 0x%04X, 0x%04X },\n", rotX, rotY, rotZ); - entryStr += StringHelper::Sprintf("\t%s,\n", childName.c_str()); - entryStr += StringHelper::Sprintf("\t%s\n", siblingName.c_str()); - } - else - { - std::string childStr; - std::string siblingStr; - if (limbsTable != nullptr) - { - childStr = limbsTable->GetLimbEnumName(childIndex); - siblingStr = limbsTable->GetLimbEnumName(siblingIndex); - } - else - { - childStr = StringHelper::Sprintf("0x%02X", childIndex); - siblingStr = StringHelper::Sprintf("0x%02X", siblingIndex); - } - - if (type != ZLimbType::Curve) - { - entryStr += StringHelper::Sprintf("{ %i, %i, %i }, ", transX, transY, transZ); - } - entryStr += StringHelper::Sprintf("%s, %s,\n", childStr.c_str(), siblingStr.c_str()); - - switch (type) - { - case ZLimbType::Standard: - entryStr += StringHelper::Sprintf("\t%s\n", dListStr.c_str()); - break; - - case ZLimbType::LOD: - case ZLimbType::Curve: - entryStr += - StringHelper::Sprintf("\t{ %s, %s }\n", dListStr.c_str(), dListStr2.c_str()); - break; - - case ZLimbType::Skin: - { - std::string skinSegmentStr; - Globals::Instance->GetSegmentedPtrName(skinSegment, parent, "", skinSegmentStr, - parent->workerID); - entryStr += - StringHelper::Sprintf("\t0x%02X, %s\n", skinSegmentType, skinSegmentStr.c_str()); - } - break; - - case ZLimbType::Legacy: - break; - - case ZLimbType::Invalid: - break; - } - } - - return entryStr; -} - -std::string ZLimb::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sLimb_%06X", prefix.c_str(), rawDataIndex); -} - -std::string ZLimb::GetSourceTypeName() const -{ - return GetSourceTypeName(type); -} - -ZResourceType ZLimb::GetResourceType() const -{ - return ZResourceType::Limb; -} - -ZLimbType ZLimb::GetLimbType() -{ - return type; -} - -void ZLimb::SetLimbType(ZLimbType value) -{ - type = value; -} - -const char* ZLimb::GetSourceTypeName(ZLimbType limbType) -{ - switch (limbType) - { - case ZLimbType::Standard: - return "StandardLimb"; - - case ZLimbType::LOD: - return "LodLimb"; - - case ZLimbType::Skin: - return "SkinLimb"; - - case ZLimbType::Curve: - return "SkelCurveLimb"; - - case ZLimbType::Legacy: - return "LegacyLimb"; - - default: - return "StandardLimb"; - } -} - -ZLimbType ZLimb::GetTypeByAttributeName(const std::string& attrName) -{ - if (attrName == "Standard") - { - return ZLimbType::Standard; - } - if (attrName == "LOD") - { - return ZLimbType::LOD; - } - if (attrName == "Skin") - { - return ZLimbType::Skin; - } - if (attrName == "Curve") - { - return ZLimbType::Curve; - } - if (attrName == "Legacy") - { - return ZLimbType::Legacy; - } - return ZLimbType::Invalid; -} - -void ZLimb::SetLimbIndex(uint8_t nLimbIndex) -{ - limbIndex = nLimbIndex; -} - -void ZLimb::DeclareDList(segptr_t dListSegmentedPtr, const std::string& prefix, - const std::string& limbSuffix) -{ - if (dListSegmentedPtr == 0 || GETSEGNUM(dListSegmentedPtr) != parent->segment) - return; - - uint32_t dlistOffset = Seg2Filespace(dListSegmentedPtr, parent->baseAddress); - if (parent->HasDeclaration(dlistOffset)) - return; - - if (!parent->IsOffsetInFileRange(dlistOffset) || dlistOffset >= parent->GetRawData().size()) - return; - - std::string dlistName; - bool declFound = Globals::Instance->GetSegmentedArrayIndexedName(dListSegmentedPtr, 8, parent, - "Gfx", dlistName, parent->workerID); - if (declFound) - return; - - int32_t dlistLength = ZDisplayList::GetDListLength( - parent->GetRawData(), dlistOffset, - Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX); - ZDisplayList* dlist = new ZDisplayList(parent); - dlist->ExtractFromBinary(dlistOffset, dlistLength); - - std::string dListStr = - StringHelper::Sprintf("%s%sDL_%06X", prefix.c_str(), limbSuffix.c_str(), dlistOffset); - dlist->SetName(dListStr); - dlist->DeclareVar(prefix, ""); - parent->AddResource(dlist); -} diff --git a/ZAPDTR/ZAPD/ZLimb.h b/ZAPDTR/ZAPD/ZLimb.h deleted file mode 100644 index b75236f5e..000000000 --- a/ZAPDTR/ZAPD/ZLimb.h +++ /dev/null @@ -1,74 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "OtherStructs/SkinLimbStructs.h" -#include "ZDisplayList.h" -#include "ZFile.h" - -enum class ZLimbType -{ - Invalid, - Standard, - LOD, - Skin, - Curve, - Legacy, -}; - -class ZLimbTable; - -class ZLimb : public ZResource -{ -public: - std::string enumName; - ZLimbTable* limbsTable = nullptr; // borrowed pointer, do not delete! - - ZLimbType type = ZLimbType::Standard; - - ZLimbSkinType skinSegmentType = ZLimbSkinType::SkinType_0; // Skin only - segptr_t skinSegment = 0; // Skin only - Struct_800A5E28 segmentStruct = {0}; // Skin only - - // Legacy only - float legTransX = 0, legTransY = 0, legTransZ = 0; // Vec3f - uint16_t rotX = 0, rotY = 0, rotZ = 0; // Vec3s - segptr_t childPtr = 0; // LegacyLimb* - segptr_t siblingPtr = 0; // LegacyLimb* - - segptr_t dListPtr = 0; - segptr_t dList2Ptr = 0; // LOD and Curve Only - - int16_t transX = 0, transY = 0, transZ = 0; - uint8_t childIndex = 0, siblingIndex = 0; - - uint8_t limbIndex = 0; - - ZLimb(ZFile* nParent); - - void ExtractFromBinary(uint32_t nRawDataIndex, ZLimbType nType); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - size_t GetRawDataSize() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - ZLimbType GetLimbType(); - void SetLimbType(ZLimbType value); - static const char* GetSourceTypeName(ZLimbType limbType); - static ZLimbType GetTypeByAttributeName(const std::string& attrName); - - void SetLimbIndex(uint8_t nLimbIndex); - -protected: - void DeclareDList(segptr_t dListSegmentedPtr, const std::string& prefix, - const std::string& limbSuffix); -}; diff --git a/ZAPDTR/ZAPD/ZMtx.cpp b/ZAPDTR/ZAPD/ZMtx.cpp deleted file mode 100644 index b9ca3f22d..000000000 --- a/ZAPDTR/ZAPD/ZMtx.cpp +++ /dev/null @@ -1,58 +0,0 @@ -#include "ZMtx.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Mtx, ZMtx); - -ZMtx::ZMtx(ZFile* nParent) : ZResource(nParent) -{ -} - -void ZMtx::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - for (size_t i = 0; i < 4; ++i) - for (size_t j = 0; j < 4; ++j) - mtx[i][j] = BitConverter::ToInt32BE(rawData, rawDataIndex + (i * 4 + j) * 4); -} - -size_t ZMtx::GetRawDataSize() const -{ - return 64; -} - -std::string ZMtx::GetBodySourceCode() const -{ - std::string bodyStr = "\n"; - - for (const auto& row : mtx) - { - bodyStr += " "; - - for (int32_t val : row) - bodyStr += StringHelper::Sprintf("%-11i, ", val); - - bodyStr += "\n"; - } - - return bodyStr; -} - -std::string ZMtx::GetSourceTypeName() const -{ - return "Mtx"; -} - -ZResourceType ZMtx::GetResourceType() const -{ - return ZResourceType::Mtx; -} - -DeclarationAlignment ZMtx::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align8; -} diff --git a/ZAPDTR/ZAPD/ZMtx.h b/ZAPDTR/ZAPD/ZMtx.h deleted file mode 100644 index 1b5513cd4..000000000 --- a/ZAPDTR/ZAPD/ZMtx.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include -#include -#include "ZResource.h" - -class ZMtx : public ZResource -{ -public: - ZMtx(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - -public: - std::array, 4> mtx; -}; diff --git a/ZAPDTR/ZAPD/ZPath.cpp b/ZAPDTR/ZAPD/ZPath.cpp deleted file mode 100644 index 849b4edfc..000000000 --- a/ZAPDTR/ZAPD/ZPath.cpp +++ /dev/null @@ -1,212 +0,0 @@ -#include "ZPath.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Path, ZPath); - -ZPath::ZPath(ZFile* nParent) : ZResource(nParent) -{ - numPaths = 1; - RegisterOptionalAttribute("NumPaths", "1"); -} - -void ZPath::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - numPaths = StringHelper::StrToL(registeredAttributes.at("NumPaths").value); - - if (numPaths < 1) - { - HANDLE_ERROR_RESOURCE( - WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("invalid value '%d' found for 'NumPaths' attribute", numPaths), - "Should be at least '1'"); - } -} - -void ZPath::ParseRawData() -{ - ZResource::ParseRawData(); - - uint32_t currentPtr = rawDataIndex; - - pathways.reserve(numPaths); - for (size_t pathIndex = 0; pathIndex < numPaths; pathIndex++) - { - PathwayEntry path(parent); - path.ExtractFromFile(currentPtr); - - if (path.GetListAddress() == 0) - break; - - currentPtr += path.GetRawDataSize(); - pathways.push_back(path); - } -} - -void ZPath::DeclareReferences(const std::string& prefix) -{ - ZResource::DeclareReferences(prefix); - - for (auto& entry : pathways) - entry.DeclareReferences(prefix); -} - -Declaration* ZPath::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), name, pathways.size(), bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZPath::GetBodySourceCode() const -{ - std::string declaration; - - size_t index = 0; - for (const auto& entry : pathways) - { - declaration += StringHelper::Sprintf("\t{ %s },", entry.GetBodySourceCode().c_str()); - - if (index < pathways.size() - 1) - declaration += "\n"; - - index++; - } - - return declaration; -} - -std::string ZPath::GetSourceTypeName() const -{ - return "Path"; -} - -ZResourceType ZPath::GetResourceType() const -{ - return ZResourceType::Path; -} - -size_t ZPath::GetRawDataSize() const -{ - return pathways.size() * pathways.at(0).GetRawDataSize(); -} - -void ZPath::SetNumPaths(uint32_t nNumPaths) -{ - numPaths = nNumPaths; -} - -/* PathwayEntry */ - -PathwayEntry::PathwayEntry(ZFile* nParent) : ZResource(nParent) -{ -} - -void PathwayEntry::ParseRawData() -{ - ZResource::ParseRawData(); - auto parentRawData = parent->GetRawData(); - numPoints = parentRawData.at(rawDataIndex + 0); - unk1 = parentRawData.at(rawDataIndex + 1); - unk2 = BitConverter::ToInt16BE(parentRawData, rawDataIndex + 2); - listSegmentAddress = BitConverter::ToInt32BE(parentRawData, rawDataIndex + 4); - - uint32_t currentPtr = GETSEGOFFSET(listSegmentAddress); - - points.reserve(numPoints); - for (int32_t i = 0; i < numPoints; i++) - { - ZVector vec(parent); - vec.ExtractFromBinary(currentPtr, ZScalarType::ZSCALAR_S16, 3); - - currentPtr += vec.GetRawDataSize(); - points.push_back(vec); - } -} - -void PathwayEntry::DeclareReferences(const std::string& prefix) -{ - ZResource::DeclareReferences(prefix); - if (points.empty()) - return; - - std::string pointsName; - bool addressFound = Globals::Instance->GetSegmentedPtrName(listSegmentAddress, parent, "Vec3s", - pointsName, parent->workerID); - if (addressFound) - return; - - std::string declaration = ""; - - size_t index = 0; - for (const auto& point : points) - { - declaration += StringHelper::Sprintf("\t{ %s },", point.GetBodySourceCode().c_str()); - - if (index < points.size() - 1) - declaration += "\n"; - - index++; - } - - uint32_t pointsOffset = Seg2Filespace(listSegmentAddress, parent->baseAddress); - Declaration* decl = parent->GetDeclaration(pointsOffset); - if (decl == nullptr) - { - pointsName = StringHelper::Sprintf("%sPathwayList_%06X", prefix.c_str(), pointsOffset); - parent->AddDeclarationArray(pointsOffset, points.at(0).GetDeclarationAlignment(), - points.size() * 6, points.at(0).GetSourceTypeName(), pointsName, - points.size(), declaration); - } - else - decl->text = declaration; -} - -std::string PathwayEntry::GetBodySourceCode() const -{ - std::string declaration; - std::string listName; - Globals::Instance->GetSegmentedPtrName(listSegmentAddress, parent, "Vec3s", listName, - parent->workerID); - - if (Globals::Instance->game == ZGame::MM_RETAIL) - declaration += - StringHelper::Sprintf("%i, %i, %i, %s", numPoints, unk1, unk2, listName.c_str()); - else - declaration += StringHelper::Sprintf("%i, %s", numPoints, listName.c_str()); - - return declaration; -} - -std::string PathwayEntry::GetSourceTypeName() const -{ - return "Path"; -} - -ZResourceType PathwayEntry::GetResourceType() const -{ - return ZResourceType::Path; -} - -size_t PathwayEntry::GetRawDataSize() const -{ - return 0x08; -} - -segptr_t PathwayEntry::GetListAddress() const -{ - return listSegmentAddress; -} diff --git a/ZAPDTR/ZAPD/ZPath.h b/ZAPDTR/ZAPD/ZPath.h deleted file mode 100644 index 722e84afe..000000000 --- a/ZAPDTR/ZAPD/ZPath.h +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "ZVector.h" - -class PathwayEntry : public ZResource -{ -public: - PathwayEntry(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - segptr_t GetListAddress() const; - -public: - int32_t numPoints; - int8_t unk1; // (MM Only) - int16_t unk2; // (MM Only) - segptr_t listSegmentAddress; - std::vector points; -}; - -class ZPath : public ZResource -{ -public: - ZPath(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - void SetNumPaths(uint32_t nNumPaths); - -public: - uint32_t numPaths; - std::vector pathways; -}; diff --git a/ZAPDTR/ZAPD/ZPlayerAnimationData.cpp b/ZAPDTR/ZAPD/ZPlayerAnimationData.cpp deleted file mode 100644 index ab633c129..000000000 --- a/ZAPDTR/ZAPD/ZPlayerAnimationData.cpp +++ /dev/null @@ -1,101 +0,0 @@ -#include "ZPlayerAnimationData.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include - -REGISTER_ZFILENODE(PlayerAnimationData, ZPlayerAnimationData); - -ZPlayerAnimationData::ZPlayerAnimationData(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("FrameCount"); -} - -void ZPlayerAnimationData::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - std::string& frameCountXml = registeredAttributes.at("FrameCount").value; - - frameCount = StringHelper::StrToL(frameCountXml); -} - -void ZPlayerAnimationData::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - - size_t totalSize = GetRawDataSize(); - // Divided by 2 because each value is an s16 - limbRotData.reserve(totalSize * frameCount / 2); - - for (size_t i = 0; i < totalSize; i += 2) - { - limbRotData.push_back(BitConverter::ToUInt16BE(rawData, rawDataIndex + i)); - } -} - -Declaration* ZPlayerAnimationData::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (auxName == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), name, limbRotData.size(), bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZPlayerAnimationData::GetBodySourceCode() const -{ - std::string declaration = ""; - - if (Globals::Instance->otrMode) - return ""; - - size_t index = 0; - for (const auto& entry : limbRotData) - { - if (index % 8 == 0) - { - declaration += "\t"; - } - - declaration += StringHelper::Sprintf("0x%04X, ", entry); - - if ((index + 1) % 8 == 0) - { - declaration += "\n"; - } - - index++; - } - - return declaration; -} - -std::string ZPlayerAnimationData::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sPlayerAnimationData_%06X", prefix.c_str(), rawDataIndex); -} - -std::string ZPlayerAnimationData::GetSourceTypeName() const -{ - return "s16"; -} - -ZResourceType ZPlayerAnimationData::GetResourceType() const -{ - return ZResourceType::PlayerAnimationData; -} - -size_t ZPlayerAnimationData::GetRawDataSize() const -{ - // (sizeof(Vec3s) * limbCount + 2) * frameCount - return (6 * 22 + 2) * frameCount; -} diff --git a/ZAPDTR/ZAPD/ZPlayerAnimationData.h b/ZAPDTR/ZAPD/ZPlayerAnimationData.h deleted file mode 100644 index 20835f236..000000000 --- a/ZAPDTR/ZAPD/ZPlayerAnimationData.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include -#include - -#include "ZResource.h" - -class ZPlayerAnimationData : public ZResource -{ -public: - int16_t frameCount = 0; - std::vector limbRotData; - - ZPlayerAnimationData(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZPointer.cpp b/ZAPDTR/ZAPD/ZPointer.cpp deleted file mode 100644 index 6e6945cad..000000000 --- a/ZAPDTR/ZAPD/ZPointer.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include "ZPointer.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Pointer, ZPointer); - -ZPointer::ZPointer(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("Type"); -} - -void ZPointer::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - type = registeredAttributes.at("Type").value; -} - -void ZPointer::ParseRawData() -{ - auto& rawData = parent->GetRawData(); - - ptr = BitConverter::ToUInt32BE(rawData, rawDataIndex); -} - -std::string ZPointer::GetBodySourceCode() const -{ - std::string ptrName; - - Globals::Instance->GetSegmentedPtrName(ptr, parent, "", ptrName); - - return ptrName; -} - -bool ZPointer::DoesSupportArray() const -{ - return true; -} - -std::string ZPointer::GetSourceTypeName() const -{ - return type + "*"; -} - -ZResourceType ZPointer::GetResourceType() const -{ - return ZResourceType::Pointer; -} - -size_t ZPointer::GetRawDataSize() const -{ - return 0x04; -} diff --git a/ZAPDTR/ZAPD/ZPointer.h b/ZAPDTR/ZAPD/ZPointer.h deleted file mode 100644 index 8fb588933..000000000 --- a/ZAPDTR/ZAPD/ZPointer.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "ZResource.h" - -class ZPointer : public ZResource -{ -public: - segptr_t ptr = SEGMENTED_NULL; - std::string type; - - ZPointer(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - std::string GetBodySourceCode() const override; - - bool DoesSupportArray() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZResource.cpp b/ZAPDTR/ZAPD/ZResource.cpp deleted file mode 100644 index aacc7afdc..000000000 --- a/ZAPDTR/ZAPD/ZResource.cpp +++ /dev/null @@ -1,439 +0,0 @@ -#include "ZResource.h" - -#include -#include - -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" -#include -#include -#include -#include - -ZResource::ZResource(ZFile* nParent) -{ - // assert(nParent != nullptr); - parent = nParent; - name = ""; - outName = ""; - sourceOutput = ""; - rawDataIndex = 0; - outputDeclaration = true; - hash = 0; - - RegisterRequiredAttribute("Name"); - RegisterOptionalAttribute("OutName"); - RegisterOptionalAttribute("Offset"); - RegisterOptionalAttribute("Custom"); - RegisterOptionalAttribute("Static", "Global"); -} - -void ZResource::ExtractFromXML(tinyxml2::XMLElement* reader, offset_t nRawDataIndex) -{ - rawDataIndex = nRawDataIndex; - declaredInXml = true; - - if (reader != nullptr) - ParseXML(reader); - - // Don't parse raw data of external files - if (parent->GetMode() != ZFileMode::ExternalFile) - { - ParseRawData(); - CalcHash(); - } - - if (!isInner) - { - Declaration* decl = DeclareVar(parent->GetName(), ""); - if (decl != nullptr) - { - decl->declaredInXml = true; - decl->staticConf = staticConf; - } - } -} - -void ZResource::ExtractFromFile(offset_t nRawDataIndex) -{ - rawDataIndex = nRawDataIndex; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); - CalcHash(); -} - -void ZResource::ParseXML(tinyxml2::XMLElement* reader) -{ - if (reader != nullptr) - { - // If it is an inner node, then 'Name' isn't required - if (isInner) - { - registeredAttributes.at("Name").isRequired = false; - } - - auto attrs = reader->FirstAttribute(); - while (attrs != nullptr) - { - std::string attrName = attrs->Name(); - bool attrDeclared = false; - - if (registeredAttributes.find(attrName) != registeredAttributes.end()) - { - registeredAttributes[attrName].value = attrs->Value(); - registeredAttributes[attrName].wasSet = true; - attrDeclared = true; - } - - if (!attrDeclared) - { - HANDLE_WARNING_RESOURCE( - WarningType::UnknownAttribute, parent, this, rawDataIndex, - StringHelper::Sprintf("unexpected '%s' attribute in resource <%s>", - attrName.c_str(), reader->Name()), - ""); - } - attrs = attrs->Next(); - } - - if (!Globals::Instance->otrMode) - { - if (!canHaveInner && !reader->NoChildren()) - { - std::string errorHeader = StringHelper::Sprintf( - "resource '%s' with inner element/child detected", reader->Name()); - HANDLE_ERROR_PROCESS(WarningType::InvalidXML, errorHeader, ""); - } - } - - for (const auto& attr : registeredAttributes) - { - if (attr.second.isRequired && attr.second.value == "") - { - std::string headerMsg = - StringHelper::Sprintf("missing required attribute '%s' in resource <%s>", - attr.first.c_str(), reader->Name()); - HANDLE_ERROR_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - headerMsg, ""); - } - } - - name = registeredAttributes.at("Name").value; - - // Disable this check for OTR file generation for now since it takes up a considerable amount of CPU time - if (!Globals::Instance->otrMode) - { - static std::regex r("[a-zA-Z_]+[a-zA-Z0-9_]*", - std::regex::icase | std::regex::optimize); - - if (!isInner || (isInner && name != "")) - { - if (!std::regex_match(name, r)) - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, - rawDataIndex, "invalid value found for 'Name' attribute", - ""); - } - } - } - - outName = registeredAttributes.at("OutName").value; - if (outName == "") - outName = name; - - isCustomAsset = registeredAttributes["Custom"].wasSet; - - std::string& staticXml = registeredAttributes["Static"].value; - if (staticXml == "Global") - { - staticConf = StaticConfig::Global; - } - else if (staticXml == "On") - { - staticConf = StaticConfig::On; - } - else if (staticXml == "Off") - { - staticConf = StaticConfig::Off; - } - else - { - HANDLE_ERROR_RESOURCE( - WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("invalid value '%s' for 'Static' attribute", staticConf), ""); - } - - declaredInXml = true; - } -} - -void ZResource::ParseRawData() -{ -} - -void ZResource::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ -} - -void ZResource::ParseRawDataLate() -{ -} - -void ZResource::DeclareReferencesLate([[maybe_unused]] const std::string& prefix) -{ -} - -Declaration* ZResource::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclaration(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, bodyStr); - decl->staticConf = staticConf; - return decl; -} - -void ZResource::Save([[maybe_unused]] const fs::path& outFolder) -{ -} - -const std::string& ZResource::GetName() const -{ - return name; -} - -const std::string& ZResource::GetOutName() const -{ - return outName; -} - -void ZResource::SetOutName(const std::string& nName) -{ - outName = nName; -} - -void ZResource::SetName(const std::string& nName) -{ - name = nName; -} - -bool ZResource::IsExternalResource() const -{ - return false; -} - -bool ZResource::DoesSupportArray() const -{ - return false; -} - -std::string ZResource::GetExternalExtension() const -{ - return ""; -} - -DeclarationAlignment ZResource::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align4; -} - -bool ZResource::WasDeclaredInXml() const -{ - return declaredInXml; -} - -StaticConfig ZResource::GetStaticConf() const -{ - return staticConf; -} - -offset_t ZResource::GetRawDataIndex() const -{ - return rawDataIndex; -} - -void ZResource::SetRawDataIndex(offset_t nRawDataIndex) -{ - rawDataIndex = nRawDataIndex; -} - -std::string ZResource::GetBodySourceCode() const -{ - return "ERROR"; -} - -std::string ZResource::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), GetSourceTypeName().c_str(), - rawDataIndex); -} - -void ZResource::GetSourceOutputCode([[maybe_unused]] const std::string& prefix) -{ - std::string bodyStr = GetBodySourceCode(); - - if (bodyStr != "ERROR") - { - Declaration* decl = parent->GetDeclaration(rawDataIndex); - - if (decl == nullptr || decl->isPlaceholder) - decl = DeclareVar(prefix, bodyStr); - else - decl->text = bodyStr; - - // OTRTODO: This is a hack and we need something more elegant in the future... - if (GetResourceType() == ZResourceType::Array) - { - ZArray* arr = (ZArray*)this; - if (arr->resList[0]->GetResourceType() == ZResourceType::Vertex) - { - for (int i = 0; i < arr->resList.size(); i++) - { - ZVtx* vtx = (ZVtx*)arr->resList[i]; - decl->vertexHack.push_back(vtx); - - } - } - } - - if (decl != nullptr) - decl->staticConf = staticConf; - } -} - -std::string ZResource::GetSourceOutputHeader([[maybe_unused]] const std::string& prefix, std::set *nameSet) -{ - if (Globals::Instance->otrMode && genOTRDef) - { - std::string str = ""; - std::string nameStr = StringHelper::Strip(StringHelper::Strip(name, "\n"), "\r"); - - std::string outName = parent->GetOutName(); - std::string prefix = ""; - - if (GetResourceType() == ZResourceType::DisplayList || GetResourceType() == ZResourceType::Texture) - { - //ZDisplayList* dList = (ZDisplayList*)this; - - if (StringHelper::Contains(outName, "_room_")) - { - outName = StringHelper::Split(outName, "_room")[0] + "_scene"; - } - } - - std::string xmlPath = StringHelper::Replace(parent->GetXmlFilePath().string(), "\\", "/"); - - if (StringHelper::Contains(outName, "_room_") || StringHelper::Contains(outName, "_scene")) - prefix = "scenes/nonmq"; - else if (StringHelper::Contains(xmlPath, "objects/")) - prefix = "objects"; - else if (StringHelper::Contains(xmlPath, "textures/")) - prefix = "textures"; - else if (StringHelper::Contains(xmlPath, "overlays/")) - prefix = "overlays"; - else if (StringHelper::Contains(xmlPath, "misc/")) - prefix = "misc"; - else if (StringHelper::Contains(xmlPath, "code/")) - prefix = "code"; - else if (StringHelper::Contains(xmlPath, "text/")) - prefix = "text"; - - if (prefix != "") { - str += StringHelper::Sprintf("#define d%s \"__OTR__%s/%s/%s\"", name.c_str(), prefix.c_str(), outName.c_str(), nameStr.c_str()); - } - else - str += StringHelper::Sprintf("#define d%s \"__OTR__%s/%s\"", name.c_str(), outName.c_str(), nameStr.c_str()); - - if (nameSet && nameSet->find(name) == nameSet->end()) { - str += StringHelper::Sprintf("\n"); - str += StringHelper::Sprintf(R"(static const ALIGN_ASSET(2) char %s[] = d%s;)", name.c_str(), name.c_str()); - - if (nameSet) { - nameSet->insert(name); - } - } - - if (name == "gTitleZeldaShieldLogoMQTex") - { - std::string addName = "gTitleZeldaShieldLogoTex"; - nameStr = StringHelper::Strip(StringHelper::Strip(addName, "\n"), "\r"); - str += StringHelper::Sprintf("\n\n#define d%s \"__OTR__%s/%s/%s\"", addName.c_str(), prefix.c_str(), outName.c_str(), nameStr.c_str()); - if (nameSet && nameSet->find(addName) == nameSet->end()) - { - str += StringHelper::Sprintf("\n"); - str += StringHelper::Sprintf(R"(static const ALIGN_ASSET(2) char %s[] = d%s;)", addName.c_str(), addName.c_str()); - - if (nameSet) - { - nameSet->insert(addName); - } - } - } - - return str; - } - else - return ""; -} - -ZResourceType ZResource::GetResourceType() const -{ - return ZResourceType::Error; -} - -void ZResource::CalcHash() -{ - hash = 0; -} - -void ZResource::SetInnerNode(bool inner) -{ - isInner = inner; -} - -void ZResource::RegisterRequiredAttribute(const std::string& attr) -{ - ResourceAttribute resAtrr; - resAtrr.key = attr; - resAtrr.isRequired = true; - registeredAttributes[attr] = resAtrr; -} - -void ZResource::RegisterOptionalAttribute(const std::string& attr, const std::string& defaultValue) -{ - ResourceAttribute resAtrr; - resAtrr.key = attr; - resAtrr.value = defaultValue; - registeredAttributes[attr] = resAtrr; -} - -offset_t Seg2Filespace(segptr_t segmentedAddress, uint32_t parentBaseAddress) -{ - offset_t currentPtr = GETSEGOFFSET(segmentedAddress); - - if (GETSEGNUM(segmentedAddress) == 0x80) // Is defined in code? - { - uint32_t parentBaseOffset = GETSEGOFFSET(parentBaseAddress); - if (parentBaseOffset > currentPtr) - { - HANDLE_ERROR(WarningType::Always, - StringHelper::Sprintf( - "resource address 0x%08X is smaller than 'BaseAddress' 0x%08X", - segmentedAddress, parentBaseAddress), - "Maybe your 'BaseAddress' is wrong?"); - } - - currentPtr -= parentBaseOffset; - } - - return currentPtr; -} diff --git a/ZAPDTR/ZAPD/ZResource.h b/ZAPDTR/ZAPD/ZResource.h deleted file mode 100644 index 05c35a26b..000000000 --- a/ZAPDTR/ZAPD/ZResource.h +++ /dev/null @@ -1,252 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include -#include "Declaration.h" -#include -#include -#include "tinyxml2.h" - -#define SEGMENT_SCENE 2 -#define SEGMENT_ROOM 3 -#define SEGMENT_KEEP 4 -#define SEGMENT_FIELDDANGEON_KEEP 5 -#define SEGMENT_OBJECT 6 -#define SEGMENT_LINKANIMETION 7 - -#define GETSEGOFFSET(x) (x & 0x00FFFFFF) -#define GETSEGNUM(x) ((x >> 24) & 0xFF) - -class ZFile; - -enum class ZResourceType -{ - Error, - Animation, - Array, - AltHeader, - Background, - Blob, - CollisionHeader, - Cutscene, - DisplayList, - Limb, - LimbTable, - Mtx, - Path, - PlayerAnimationData, - Room, - RoomCommand, - Scalar, - Scene, - Skeleton, - String, - Symbol, - Texture, - TextureAnimation, - TextureAnimationParams, - Vector, - Vertex, - Text, - Audio, - ActorList, - CollisionPoly, - Pointer, - SurfaceType, -}; - -class ResourceAttribute -{ -public: - std::string key; - std::string value; - bool isRequired = false; - bool wasSet = false; -}; - -class ZResource -{ -public: - ZFile* parent; - bool outputDeclaration = true; - uint32_t hash = 0; - bool genOTRDef = false; - - /** - * Constructor. - * Child classes should not declare any other constructor besides this one - */ - ZResource(ZFile* nParent); - virtual ~ZResource() = default; - - // Parsing from File - virtual void ExtractFromXML(tinyxml2::XMLElement* reader, offset_t nRawDataIndex); - virtual void ExtractFromFile(offset_t nRawDataIndex); - - // Misc - /** - * Parses additional attributes of the XML node. - * Extra attritbutes have to be registered using `RegisterRequiredAttribute` or - * `RegisterOptionalAttribute` in the constructor of the ZResource - */ - virtual void ParseXML(tinyxml2::XMLElement* reader); - /** - * Extracts data from the binary file - */ - virtual void ParseRawData(); - /** - * Declares any data pointed by this resource that has not been declared already. - * For example, a Vtx referenced by a Dlist should be declared here if it wasn't - * declared previously by something else - */ - virtual void DeclareReferences(const std::string& prefix); - virtual void ParseRawDataLate(); - virtual void DeclareReferencesLate(const std::string& prefix); - - /** - * Adds this resource as a Declaration of its parent ZFile - */ - virtual Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr); - /** - * Returns the body of the variable of the extracted resource, without any side-effect - */ - [[nodiscard]] virtual std::string GetBodySourceCode() const; - /** - * Creates an automatically generated variable name for the current resource - */ - [[nodiscard]] virtual std::string GetDefaultName(const std::string& prefix) const; - - virtual void GetSourceOutputCode(const std::string& prefix); - virtual std::string GetSourceOutputHeader(const std::string& prefix, std::set *nameSet); - virtual void CalcHash(); - /** - * Exports the resource to binary format - */ - virtual void Save(const fs::path& outFolder); - - // Properties - /** - * Returns true if the resource will be externalized, and included back to the C file using - * `#include`s - */ - virtual bool IsExternalResource() const; - /** - * Can this type be wrapped in an node? - */ - virtual bool DoesSupportArray() const; - /** - * The type of the resource as a C struct - */ - [[nodiscard]] virtual std::string GetSourceTypeName() const = 0; - /** - * The type in the ZResource enum - */ - [[nodiscard]] virtual ZResourceType GetResourceType() const = 0; - /** - * The filename extension for assets extracted as standalone files - */ - [[nodiscard]] virtual std::string GetExternalExtension() const; - - // Getters/Setters - [[nodiscard]] const std::string& GetName() const; - void SetName(const std::string& nName); - [[nodiscard]] const std::string& GetOutName() const; - void SetOutName(const std::string& nName); - [[nodiscard]] offset_t GetRawDataIndex() const; - void SetRawDataIndex(offset_t nRawDataIndex); - - /** - * The size of the current struct being extracted, not counting data referenced by it - */ - [[nodiscard]] virtual size_t GetRawDataSize() const = 0; - /** - * The alignment of the extracted struct - */ - [[nodiscard]] virtual DeclarationAlignment GetDeclarationAlignment() const; - void SetInnerNode(bool inner); - /** - * Returns `true` if this ZResource was declared using an XML node, - * `false` otherwise (for example, a Vtx extracted indirectly by a DList) - */ - [[nodiscard]] bool WasDeclaredInXml() const; - [[nodiscard]] StaticConfig GetStaticConf() const; - -protected: - std::string name; - std::string outName; - offset_t rawDataIndex; - std::string sourceOutput; - - // Inner is used mostly for nodes - /** - * Is this resource an inner node of another resource? - * (namely inside an ) - */ - bool isInner = false; - /** - * Can this type have an inner node? - */ - bool canHaveInner = false; - - /** - * If set to true, create a reference for the asset in the file, but don't - * actually try to extract it from the file - */ - bool isCustomAsset; - bool declaredInXml = false; - StaticConfig staticConf = StaticConfig::Global; - - // Reading from this XMLs attributes should be performed in the overrided `ParseXML` method. - std::map registeredAttributes; - - // XML attributes registers. - // Registering XML attributes should be done in constructors. - - // The resource needs this attribute. If it is not provided, then the program will throw an - // exception. - void RegisterRequiredAttribute(const std::string& attr); - // Optional attribute. The resource has to do manual checks and manual warnings. It may or may - // not have a value. - void RegisterOptionalAttribute(const std::string& attr, const std::string& defaultValue = ""); -}; - -class ZResourceExporter -{ -public: - ZResourceExporter() = default; - virtual ~ZResourceExporter() = default; - - virtual void Save(ZResource* res, const fs::path& outPath, BinaryWriter* writer) = 0; -}; - -offset_t Seg2Filespace(segptr_t segmentedAddress, uint32_t parentBaseAddress); - -typedef ZResource*(ZResourceFactoryFunc)(ZFile* nParent); - -#define REGISTER_ZFILENODE(nodeName, zResClass) \ - static ZResource* ZResourceFactory_##zResClass_##nodeName(ZFile* nParent) \ - { \ - return static_cast(new zResClass(nParent)); \ - } \ - \ - class ZRes_##nodeName \ - { \ - public: \ - ZRes_##nodeName() \ - { \ - ZFile::RegisterNode(#nodeName, &ZResourceFactory_##zResClass_##nodeName); \ - } \ - }; \ - static ZRes_##nodeName inst_ZRes_##nodeName - -#define REGISTER_EXPORTER(expFunc) \ - class ZResExp_##expFunc \ - { \ - public: \ - ZResExp_##expFunc() { expFunc(); } \ - }; \ - static ZResExp_##expFunc inst_ZResExp_##expFunc diff --git a/ZAPDTR/ZAPD/ZRom.cpp b/ZAPDTR/ZAPD/ZRom.cpp deleted file mode 100644 index e9b583b26..000000000 --- a/ZAPDTR/ZAPD/ZRom.cpp +++ /dev/null @@ -1,234 +0,0 @@ -#include "ZRom.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Directory.h" -#include "yaz0/yaz0.h" - -#ifdef __linux__ -#include -#endif -#include - -namespace fs = std::filesystem; - -#define DMA_ENTRY_SIZE 16 - -#if defined(_MSC_VER) -#define __bswap_32 _byteswap_ulong -#define bswap_32 _byteswap_ulong -#endif -#if defined __APPLE__ -#define __bswap32 __builtin_bswap32 -#define bswap32 __builtin_bswap32 -#endif - -// ROM DMA Table Start -#define OOT_OFF_NTSC_10_RC 0x7430 -#define OOT_OFF_NTSC_10 0x7430 -#define OOT_OFF_NTSC_11 0x7430 -#define OOT_OFF_PAL_10 0x7950 -#define OOT_OFF_NTSC_12 0x7960 -#define OOT_OFF_PAL_11 0x7950 -#define OOT_OFF_JP_GC 0x7170 -#define OOT_OFF_JP_MQ 0x7170 -#define OOT_OFF_US_GC 0x7170 -#define OOT_OFF_US_MQ 0x7170 -#define OOT_OFF_PAL_GC_DBG1 0x12F70 -#define OOT_OFF_PAL_MQ_DBG 0x12F70 -#define OOT_OFF_PAL_GC_DBG2 0x12F70 -#define OOT_OFF_PAL_GC 0x7170 -#define OOT_OFF_PAL_MQ 0x7170 -#define OOT_OFF_JP_GC_CE 007170 -#define OOT_OFF_CN_IQUE 0xB7A0 -#define OOT_OFF_TW_IQUE 0xB240 - -#define MM_OFF_US_10 0x1A500 -#define MM_OFF_JP_10 0x1C110 -#define MM_OFF_JP_11 0x1C050 -#define MM_OFF_DBG 0x24F60 - -#define OOT_NTSC_10 0xEC7011B7 -#define OOT_NTSC_11 0xD43DA81F -#define OOT_NTSC_12 0x693BA2AE -#define OOT_PAL_10 0xB044B569 -#define OOT_PAL_11 0xB2055FBD -#define OOT_NTSC_JP_GC_CE 0xF7F52DB8 -#define OOT_NTSC_JP_GC 0xF611F4BA -#define OOT_NTSC_US_GC 0xF3DD35BA -#define OOT_PAL_GC 0x09465AC3 -#define OOT_NTSC_JP_MQ 0xF43B45BA -#define OOT_NTSC_US_MQ 0xF034001A -#define OOT_PAL_MQ 0x1D4136F3 -#define OOT_PAL_GC_DBG1 0x871E1C92 // 03-21-2002 build -#define OOT_PAL_GC_DBG2 0x87121EFE // 03-13-2002 build -#define OOT_PAL_GC_MQ_DBG 0x917D18F6 -#define OOT_IQUE_TW 0x3D81FB3E -#define OOT_IQUE_CN 0xB1E1E07B -#define UNKNOWN 0xFFFFFFFF - -bool ZRom::IsMQ() { - int crc = BitConverter::ToInt32BE(romData, 0x10); - switch (crc) { - case OOT_NTSC_10: - case OOT_NTSC_11: - case OOT_NTSC_12: - case OOT_PAL_10: - case OOT_PAL_11: - case OOT_NTSC_JP_GC: - case OOT_NTSC_JP_GC_CE: - case OOT_NTSC_US_GC: - case OOT_PAL_GC: - case OOT_PAL_GC_DBG1: - case OOT_PAL_GC_DBG2: - case OOT_IQUE_CN: - case OOT_IQUE_TW: - default: - return false; - case OOT_NTSC_JP_MQ: - case OOT_NTSC_US_MQ: - case OOT_PAL_MQ: - case OOT_PAL_GC_MQ_DBG: - return true; - } -} - -ZRom::ZRom(std::string romPath) -{ - RomVersion version; - romData = DiskFile::ReadAllBytes(romPath); - - BitConverter::RomToBigEndian(romData.data(), romData.size()); - - version.crc = BitConverter::ToInt32BE(romData, 0x10); - - switch (version.crc) - { - case OOT_NTSC_10: - version.version = "N64 NTSC 1.0"; - version.listPath = "ntsc_oot.txt"; - version.offset = OOT_OFF_NTSC_10; - break; - case OOT_NTSC_11: - version.version = "N64 NTSC 1.1"; - version.listPath = "ntsc_oot.txt"; - version.offset = OOT_OFF_NTSC_11; - break; - case OOT_NTSC_12: - version.version = "N64 NTSC 1.2"; - version.listPath = "ntsc_oot.txt"; - version.offset = OOT_OFF_NTSC_12; - break; - case OOT_PAL_10: - version.version = "N64 PAL 1.0"; - version.listPath = "pal_oot.txt"; - version.offset = OOT_OFF_PAL_10; - break; - case OOT_PAL_11: - version.version = "N64 PAL 1.1"; - version.listPath = "pal_oot.txt"; - version.offset = OOT_OFF_PAL_11; - break; - case OOT_NTSC_JP_GC: - version.version = "JP GameCube (MQ Disk)"; - version.listPath = "gamecube.txt"; - version.offset = OOT_OFF_JP_GC; - break; - case OOT_NTSC_JP_GC_CE: - version.version = "GameCube (Collectors Edition Disk)"; - version.listPath = "gamecube.txt"; - version.offset = OOT_OFF_JP_GC_CE; - break; - case OOT_NTSC_JP_MQ: - version.version = "JP Master Quest"; - version.listPath = "gamecube.txt"; - version.offset = OOT_OFF_JP_MQ; - break; - case OOT_NTSC_US_MQ: - version.version = "NTSC Master Quest"; - version.listPath = "gamecube.txt"; - version.offset = OOT_OFF_JP_MQ; - break; - case OOT_NTSC_US_GC: - version.version = "NTSC GameCube"; - version.listPath = "gamecube.txt"; - version.offset = OOT_OFF_US_MQ; - break; - case OOT_PAL_GC: - version.version = "PAL GameCube"; - version.listPath = "gamecube_pal.txt"; - version.offset = OOT_OFF_PAL_GC; - break; - case OOT_PAL_MQ: - version.version = "PAL Master Quest"; - version.listPath = "gamecube_pal.txt"; - version.offset = OOT_OFF_PAL_MQ; - break; - case OOT_PAL_GC_DBG1: - version.version = "GameCube Debug 1.0"; - version.listPath = "dbg.txt"; - version.offset = OOT_OFF_PAL_GC_DBG1; - break; - case OOT_PAL_GC_DBG2: - version.version = "GameCube Debug 2.0"; - version.listPath = "dbg.txt"; - version.offset = OOT_OFF_PAL_GC_DBG2; - break; - case OOT_PAL_GC_MQ_DBG: - version.version = "GameCube MQ-Debug"; - version.listPath = "dbg.txt"; - version.offset = OOT_OFF_PAL_MQ_DBG; - break; - case OOT_IQUE_CN: - version.version = "OoT IQue"; - version.listPath = "ique.txt"; - version.offset = OOT_OFF_CN_IQUE; - break; - case OOT_IQUE_TW: - version.version = "TW IQue"; - version.listPath = "ique.txt"; - version.offset = OOT_OFF_TW_IQUE; - break; - } - - auto path = StringHelper::Sprintf("%s/%s", Globals::Instance->fileListPath.string().c_str(), version.listPath.c_str()); - auto txt = DiskFile::ReadAllText(path); - std::vector lines = StringHelper::Split(txt, "\n"); - - std::vector decompressedData(1); - - for (int i = 0; i < lines.size(); i++) - { - lines[i] = StringHelper::Strip(lines[i], "\r"); - const int romOffset = version.offset + (DMA_ENTRY_SIZE * i); - - const int virtStart = BitConverter::ToInt32BE(romData, romOffset + 0); - const int virtEnd = BitConverter::ToInt32BE(romData, romOffset + 4); - const int physStart = BitConverter::ToInt32BE(romData, romOffset + 8); - const int physEnd = BitConverter::ToInt32BE(romData, romOffset + 12); - - const bool compressed = physEnd != 0; - int size = compressed ? physEnd - physStart : virtEnd - virtStart; - - auto outData = std::vector(); - outData.resize(size); - memcpy(outData.data(), romData.data() + physStart, size); - - if (compressed) - { - int decSize = virtEnd - virtStart; - decompressedData = std::vector(); - decompressedData.resize(decSize); - yaz0_decode(outData.data(), decompressedData.data(), decSize); - files[lines[i]] = decompressedData; - } - else - files[lines[i]] = outData; - - //DiskFile::WriteAllBytes(StringHelper::Sprintf("baserom/%s", lines[i].c_str()), files[lines[i]]); - } -} - -std::vector ZRom::GetFile(std::string fileName) -{ - return files[fileName]; -} diff --git a/ZAPDTR/ZAPD/ZRom.h b/ZAPDTR/ZAPD/ZRom.h deleted file mode 100644 index 6225a1ada..000000000 --- a/ZAPDTR/ZAPD/ZRom.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -class ZRom -{ -public: - ZRom(std::string romPath); - - std::vector GetFile(std::string fileName); - bool IsMQ(); - -protected: - std::vector romData; - std::map> files; -}; - -struct RomVersion -{ - std::string version = "None"; - std::string error = "None"; - std::string listPath = "None"; - int offset; - uint32_t crc; -}; \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.cpp deleted file mode 100644 index 3f64af168..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "EndMarker.h" - -EndMarker::EndMarker(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -std::string EndMarker::GetBodySourceCode() const -{ - return "SCENE_CMD_END()"; -} - -std::string EndMarker::GetCommandCName() const -{ - return "SCmdEndMarker"; -} - -RoomCommand EndMarker::GetRoomCommand() const -{ - return RoomCommand::EndMarker; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.h b/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.h deleted file mode 100644 index daa477c94..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/EndMarker.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class EndMarker : public ZRoomCommand -{ -public: - EndMarker(ZFile* nParent); - - std::string GetBodySourceCode() const override; - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; \ No newline at end of file diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp deleted file mode 100644 index ee0183706..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.cpp +++ /dev/null @@ -1,95 +0,0 @@ -#include "SetActorCutsceneList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetActorCutsceneList::SetActorCutsceneList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetActorCutsceneList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - int numCutscenes = cmdArg1; - offset_t currentPtr = segmentOffset; - - cutscenes.reserve(numCutscenes); - for (int32_t i = 0; i < numCutscenes; i++) - { - ActorCutsceneEntry entry(parent->GetRawData(), currentPtr); - cutscenes.push_back(entry); - - currentPtr += 16; - } -} - -void SetActorCutsceneList::DeclareReferences(const std::string& prefix) -{ - if (cutscenes.size() > 0) - { - std::string declaration; - - for (size_t i = 0; i < cutscenes.size(); i++) - { - const auto& entry = cutscenes.at(i); - declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); - - if (i + 1 < cutscenes.size()) - { - declaration += "\n"; - } - } - - std::string typeName = cutscenes.at(0).GetSourceTypeName(); - - parent->AddDeclarationArray( - segmentOffset, GetDeclarationAlignment(), cutscenes.size() * 16, typeName, - StringHelper::Sprintf("%s%sList_%06X", prefix.c_str(), typeName.c_str(), segmentOffset), - cutscenes.size(), declaration); - } -} - -std::string SetActorCutsceneList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorCutscene", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ACTOR_CUTSCENE_LIST(%i, %s)", cutscenes.size(), - listName.c_str()); -} - -std::string SetActorCutsceneList::GetCommandCName() const -{ - return "SCmdCutsceneActorList"; -} - -RoomCommand SetActorCutsceneList::GetRoomCommand() const -{ - return RoomCommand::SetActorCutsceneList; -} - -ActorCutsceneEntry::ActorCutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex) - : priority(BitConverter::ToInt16BE(rawData, rawDataIndex + 0)), - length(BitConverter::ToInt16BE(rawData, rawDataIndex + 2)), - unk4(BitConverter::ToInt16BE(rawData, rawDataIndex + 4)), - unk6(BitConverter::ToInt16BE(rawData, rawDataIndex + 6)), - additionalCutscene(BitConverter::ToInt16BE(rawData, rawDataIndex + 8)), - sound(rawData[rawDataIndex + 0xA]), unkB(rawData[rawDataIndex + 0xB]), - unkC(BitConverter::ToInt16BE(rawData, rawDataIndex + 0xC)), unkE(rawData[rawDataIndex + 0xE]), - letterboxSize(rawData[rawDataIndex + 0xF]) -{ -} - -std::string ActorCutsceneEntry::GetBodySourceCode() const -{ - return StringHelper::Sprintf("%i, %i, %i, %i, %i, %i, %i, %i, %i, %i", priority, length, unk4, - unk6, additionalCutscene, sound, unkB, unkC, unkE, letterboxSize); -} - -std::string ActorCutsceneEntry::GetSourceTypeName() const -{ - return "ActorCutscene"; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.h deleted file mode 100644 index 8fd48e425..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorCutsceneList.h +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class ActorCutsceneEntry -{ -protected: - int16_t priority; - int16_t length; - int16_t unk4; - int16_t unk6; - int16_t additionalCutscene; - uint8_t sound; - uint8_t unkB; - int16_t unkC; - uint8_t unkE; - uint8_t letterboxSize; - -public: - ActorCutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - std::string GetSourceTypeName() const; -}; - -class SetActorCutsceneList : public ZRoomCommand -{ -public: - std::vector cutscenes; - - SetActorCutsceneList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; - -private: -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.cpp deleted file mode 100644 index 0e667c058..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "SetActorList.h" - -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZRoom/ZRoom.h" - -SetActorList::SetActorList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetActorList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - numActors = cmdArg1; - - actorList = new ZActorList(parent); - actorList->ExtractFromBinary(segmentOffset, numActors); -} - -void SetActorList::DeclareReferences(const std::string& prefix) -{ - if (parent->HasDeclaration(segmentOffset)) - { - delete actorList; - actorList = static_cast(parent->FindResource(segmentOffset)); - assert(actorList != nullptr); - assert(actorList->GetResourceType() == ZResourceType::ActorList); - return; - } - - if (actorList->GetName() == "") - { - actorList->SetName(actorList->GetDefaultName(prefix)); - } - actorList->DeclareVar(prefix, ""); - parent->AddResource(actorList); -} - -std::string SetActorList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorEntry", listName, - parent->workerID); - - return StringHelper::Sprintf("SCENE_CMD_ACTOR_LIST(%i, %s)", numActors, listName.c_str()); -} - -std::string SetActorList::GetCommandCName() const -{ - return "SCmdActorList"; -} - -RoomCommand SetActorList::GetRoomCommand() const -{ - return RoomCommand::SetActorList; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.h deleted file mode 100644 index 9122c15bb..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetActorList.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "ZActorList.h" -#include "ZRoom/ZRoomCommand.h" - -class SetActorList : public ZRoomCommand -{ -public: - uint32_t numActors; - ZActorList* actorList = nullptr; - - SetActorList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; - -protected: - size_t GetActorListArraySize() const; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp deleted file mode 100644 index 9e61c6a76..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp +++ /dev/null @@ -1,84 +0,0 @@ -#include "SetAlternateHeaders.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -SetAlternateHeaders::SetAlternateHeaders(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetAlternateHeaders::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (cmdArg2 != 0) - { - std::string varName = - StringHelper::Sprintf("%sAlternateHeaders0x%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationPlaceholder(segmentOffset, varName); - } -} - -void SetAlternateHeaders::ParseRawDataLate() -{ - size_t numHeaders = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 4; - - headers.reserve(numHeaders); - for (uint32_t i = 0; i < numHeaders; i++) - { - int32_t address = BitConverter::ToInt32BE(parent->GetRawData(), segmentOffset + (i * 4)); - headers.push_back(address); - - if (address != 0 && parent->GetDeclaration(GETSEGOFFSET(address)) == nullptr) - { - ZRoom* altheader = new ZRoom(parent); - altheader->ExtractFromBinary(GETSEGOFFSET(address), zRoom->GetResourceType()); - altheader->DeclareReferences(parent->GetName()); - - parent->resources.push_back(altheader); - } - } -} - -void SetAlternateHeaders::DeclareReferencesLate(const std::string& prefix) -{ - if (!headers.empty()) - { - std::string declaration; - - for (size_t i = 0; i < headers.size(); i++) - { - std::string altHeaderName; - Globals::Instance->GetSegmentedPtrName(headers.at(i), parent, "", altHeaderName, - parent->workerID); - - declaration += StringHelper::Sprintf("\t%s,", altHeaderName.c_str()); - - if (i + 1 < headers.size()) - declaration += "\n"; - } - - std::string varName = - StringHelper::Sprintf("%sAlternateHeaders0x%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationArray(segmentOffset, GetDeclarationAlignment(), headers.size() * 4, - "SceneCmd*", varName, headers.size(), declaration); - } -} - -std::string SetAlternateHeaders::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "SceneCmd*", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ALTERNATE_HEADER_LIST(%s)", listName.c_str()); -} - -std::string SetAlternateHeaders::GetCommandCName() const -{ - return "SCmdAltHeaders"; -} - -RoomCommand SetAlternateHeaders::GetRoomCommand() const -{ - return RoomCommand::SetAlternateHeaders; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.h deleted file mode 100644 index e66df936d..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetAlternateHeaders.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoom.h" -#include "ZRoom/ZRoomCommand.h" - -class SetAlternateHeaders : public ZRoomCommand -{ -public: - std::vector headers; - - SetAlternateHeaders(ZFile* nParent); - - void DeclareReferences(const std::string& prefix) override; - void ParseRawDataLate() override; - void DeclareReferencesLate(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; - -private: -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp deleted file mode 100644 index 73f72136c..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/** - * File: SetAnimatedMaterialList.cpp - * Description: Defines a class SetAnimatedMaterialList to enable ZRoom to declare - * ZTextureAnimations, using that ZResource to do the work. - */ -#include "SetAnimatedMaterialList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" -#include "ZTextureAnimation.h" - -SetAnimatedMaterialList::SetAnimatedMaterialList(ZFile* nParent) - : ZRoomCommand(nParent), textureAnimation(nParent) -{ -} - -void SetAnimatedMaterialList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - textureAnimation.ExtractFromFile(segmentOffset); -} - -void SetAnimatedMaterialList::DeclareReferences(const std::string& prefix) -{ - textureAnimation.SetName(textureAnimation.GetDefaultName(prefix.c_str())); - textureAnimation.DeclareReferences(prefix); - textureAnimation.GetSourceOutputCode(prefix); -} - -std::string SetAnimatedMaterialList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "AnimatedMaterial", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ANIMATED_MATERIAL_LIST(%s)", listName.c_str()); -} - -std::string SetAnimatedMaterialList::GetCommandCName() const -{ - return "SCmdTextureAnimations"; -} - -RoomCommand SetAnimatedMaterialList::GetRoomCommand() const -{ - return RoomCommand::SetAnimatedMaterialList; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.h deleted file mode 100644 index 3dbbf9684..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" -#include "ZTextureAnimation.h" - -class SetAnimatedMaterialList : public ZRoomCommand -{ -public: - SetAnimatedMaterialList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; - -private: - ZTextureAnimation textureAnimation; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.cpp deleted file mode 100644 index ae2d31c81..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "SetCameraSettings.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -SetCameraSettings::SetCameraSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetCameraSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - cameraMovement = cmdArg1; - mapHighlight = BitConverter::ToUInt32BE(parent->GetRawData(), rawDataIndex + 4); -} - -std::string SetCameraSettings::GetBodySourceCode() const -{ - return StringHelper::Sprintf("SCENE_CMD_MISC_SETTINGS(0x%02X, 0x%08X)", cameraMovement, - mapHighlight); -} - -std::string SetCameraSettings::GetCommandCName() const -{ - return "SCmdMiscSettings"; -} - -RoomCommand SetCameraSettings::GetRoomCommand() const -{ - return RoomCommand::SetCameraSettings; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.h deleted file mode 100644 index a8fed44ec..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCameraSettings.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetCameraSettings : public ZRoomCommand -{ -public: - uint8_t cameraMovement; - uint32_t mapHighlight; - - SetCameraSettings(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; - -private: -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp deleted file mode 100644 index 4aafb7c70..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "SetCollisionHeader.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetCollisionHeader::SetCollisionHeader(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetCollisionHeader::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - - collisionHeader = new ZCollisionHeader(parent); - collisionHeader->SetName( - StringHelper::Sprintf("%sCollisionHeader_%06X", parent->GetName().c_str(), segmentOffset)); - collisionHeader->ExtractFromFile(segmentOffset); - parent->AddResource(collisionHeader); -} - -void SetCollisionHeader::DeclareReferences(const std::string& prefix) -{ - collisionHeader->DeclareVar(prefix, ""); -} - -std::string SetCollisionHeader::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CollisionHeader", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_COL_HEADER(%s)", listName.c_str()); -} - -std::string SetCollisionHeader::GetCommandCName() const -{ - return "SCmdColHeader"; -} - -RoomCommand SetCollisionHeader::GetRoomCommand() const -{ - return RoomCommand::SetCollisionHeader; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.h deleted file mode 100644 index f7d5ecf35..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCollisionHeader.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "ZCollision.h" -#include "ZRoom/ZRoomCommand.h" - -class SetCollisionHeader : public ZRoomCommand -{ -public: - ZCollisionHeader* collisionHeader; - - SetCollisionHeader(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.cpp deleted file mode 100644 index 5a9ae128e..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.cpp +++ /dev/null @@ -1,155 +0,0 @@ -#include "SetCsCamera.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetCsCamera::SetCsCamera(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetCsCamera::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - int numCameras = cmdArg1; - - uint32_t currentPtr = segmentOffset; - int32_t numPoints = 0; - - cameras.reserve(numCameras); - for (int32_t i = 0; i < numCameras; i++) - { - CsCameraEntry entry(parent->GetRawData(), currentPtr); - numPoints += entry.GetNumPoints(); - - currentPtr += entry.GetRawDataSize(); - cameras.push_back(entry); - } - - if (numPoints > 0) - { - uint32_t currentPtr = cameras.at(0).GetSegmentOffset(); - - points.reserve(numPoints); - for (int32_t i = 0; i < numPoints; i++) - { - ZVector vec(parent); - vec.ExtractFromBinary(currentPtr, ZScalarType::ZSCALAR_S16, 3); - - currentPtr += vec.GetRawDataSize(); - points.push_back(vec); - } - } -} - -void SetCsCamera::DeclareReferences(const std::string& prefix) -{ - if (points.size() > 0) - { - std::string declaration; - size_t index = 0; - for (auto& point : points) - { - declaration += StringHelper::Sprintf("\t{ %s },", point.GetBodySourceCode().c_str()); - - if (index < points.size() - 1) - declaration += "\n"; - - index++; - } - - uint32_t segOffset = cameras.at(0).GetSegmentOffset(); - - parent->AddDeclarationArray( - segOffset, DeclarationAlignment::Align4, points.size() * points.at(0).GetRawDataSize(), - points.at(0).GetSourceTypeName().c_str(), - StringHelper::Sprintf("%sCsCameraPoints_%06X", prefix.c_str(), segOffset), - points.size(), declaration); - } - - if (!cameras.empty()) - { - std::string camPointsName; - Globals::Instance->GetSegmentedPtrName(cameras.at(0).GetCamAddress(), parent, "Vec3s", - camPointsName, parent->workerID); - std::string declaration; - - size_t index = 0; - size_t pointsIndex = 0; - for (const auto& entry : cameras) - { - declaration += - StringHelper::Sprintf("\t{ %i, %i, &%s[%i] },", entry.type, entry.numPoints, - camPointsName.c_str(), pointsIndex); - - if (index < cameras.size() - 1) - declaration += "\n"; - - index++; - pointsIndex += entry.GetNumPoints(); - } - - const auto& entry = cameras.front(); - std::string camTypename = entry.GetSourceTypeName(); - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, cameras.size() * entry.GetRawDataSize(), - camTypename, - StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), camTypename.c_str(), segmentOffset), - cameras.size(), declaration); - } -} - -std::string SetCsCamera::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CsCameraEntry", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ACTOR_CUTSCENE_CAM_LIST(%i, %s)", cameras.size(), - listName.c_str()); -} - -std::string SetCsCamera::GetCommandCName() const -{ - return "SCmdCsCameraList"; -} - -RoomCommand SetCsCamera::GetRoomCommand() const -{ - return RoomCommand::SetCsCamera; -} - -CsCameraEntry::CsCameraEntry(const std::vector& rawData, uint32_t rawDataIndex) - : baseOffset(rawDataIndex), type(BitConverter::ToInt16BE(rawData, rawDataIndex + 0)), - numPoints(BitConverter::ToInt16BE(rawData, rawDataIndex + 2)) -{ - camAddress = BitConverter::ToInt32BE(rawData, rawDataIndex + 4); - segmentOffset = GETSEGOFFSET(camAddress); -} - -std::string CsCameraEntry::GetSourceTypeName() const -{ - return "CsCameraEntry"; -} - -int32_t CsCameraEntry::GetRawDataSize() const -{ - return 8; -} - -int16_t CsCameraEntry::GetNumPoints() const -{ - return numPoints; -} - -segptr_t CsCameraEntry::GetCamAddress() const -{ - return camAddress; -} - -uint32_t CsCameraEntry::GetSegmentOffset() const -{ - return segmentOffset; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.h deleted file mode 100644 index 5e0e3c825..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCsCamera.h +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" -#include "ZVector.h" - -class CsCameraEntry -{ -public: - CsCameraEntry(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetSourceTypeName() const; - int32_t GetRawDataSize() const; - - int16_t GetNumPoints() const; - segptr_t GetCamAddress() const; - uint32_t GetSegmentOffset() const; - - int baseOffset; - int16_t type; - int16_t numPoints; - segptr_t camAddress; - uint32_t segmentOffset; -}; - -class SetCsCamera : public ZRoomCommand -{ -public: - std::vector cameras; - std::vector points; - - SetCsCamera(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.cpp deleted file mode 100644 index 68ff58c19..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.cpp +++ /dev/null @@ -1,146 +0,0 @@ -#include "SetCutscenes.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetCutscenes::SetCutscenes(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetCutscenes::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - - numCutscenes = cmdArg1; - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - int32_t currentPtr = segmentOffset; - - cutsceneEntries.reserve(numCutscenes); - for (uint8_t i = 0; i < numCutscenes; i++) - { - CutsceneEntry entry(parent->GetRawData(), currentPtr); - cutsceneEntries.push_back(entry); - currentPtr += 8; - } - } - else if (Globals::Instance->game == ZGame::OOT_RETAIL || Globals::Instance->game == ZGame::OOT_SW97) - { - ZCutscene* cutscene = new ZCutscene(parent); - cutscene->ExtractFromFile(segmentOffset); - - auto decl = parent->GetDeclaration(segmentOffset); - if (decl == nullptr) - { - cutscene->DeclareVar(zRoom->GetName().c_str(), ""); - } - - cutscenes.push_back(cutscene); - } -} - -void SetCutscenes::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = name; - if (varPrefix == "") - varPrefix = prefix; - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - std::string declaration; - size_t i = 0; - - for (const auto& entry : cutsceneEntries) - { - if (entry.segmentPtr != SEGMENTED_NULL && - GETSEGNUM(entry.segmentPtr) == parent->segment) - { - offset_t csOffset = Seg2Filespace(entry.segmentPtr, parent->baseAddress); - if (!parent->HasDeclaration(csOffset)) - { - auto* cutscene = new ZCutscene(parent); - cutscene->ExtractFromFile(csOffset); - cutscene->SetName(cutscene->GetDefaultName(varPrefix)); - cutscene->DeclareVar(varPrefix, ""); - cutscene->DeclareReferences(varPrefix); - parent->AddResource(cutscene); - } - } - - std::string csName; - Globals::Instance->GetSegmentedPtrName(entry.segmentPtr, parent, "CutsceneData", - csName, parent->workerID); - - declaration += - StringHelper::Sprintf(" { %s, 0x%04X, 0x%02X, 0x%02X },", csName.c_str(), - entry.exit, entry.entrance, entry.flag); - - if (i + 1 < numCutscenes) - declaration += "\n"; - - i++; - } - - parent->AddDeclarationArray(segmentOffset, DeclarationAlignment::Align4, - cutsceneEntries.size() * 8, "CutsceneEntry", - StringHelper::Sprintf("%sCutsceneEntryList_%06X", - zRoom->GetName().c_str(), segmentOffset), - cutsceneEntries.size(), declaration); - } - else - { - if (cmdArg2 != SEGMENTED_NULL && GETSEGNUM(cmdArg2) == parent->segment) - { - offset_t csOffset = Seg2Filespace(cmdArg2, parent->baseAddress); - if (!parent->HasDeclaration(csOffset)) - { - auto* cutscene = new ZCutscene(parent); - cutscene->ExtractFromFile(csOffset); - cutscene->SetName(cutscene->GetDefaultName(varPrefix)); - cutscene->DeclareVar(varPrefix, ""); - cutscene->DeclareReferences(varPrefix); - parent->AddResource(cutscene); - } - } - } -} - -std::string SetCutscenes::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CutsceneData", listName, - parent->workerID); - - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CutsceneEntry", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_CUTSCENE_LIST(%i, %s)", numCutscenes, - listName.c_str()); - } - - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "CutsceneData", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_CUTSCENE_DATA(%s)", listName.c_str()); -} - -std::string SetCutscenes::GetCommandCName() const -{ - return "SCmdCutsceneData"; -} - -RoomCommand SetCutscenes::GetRoomCommand() const -{ - return RoomCommand::SetCutscenes; -} - -CutsceneEntry::CutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex) - : segmentPtr(BitConverter::ToInt32BE(rawData, rawDataIndex + 0)), - exit(BitConverter::ToInt16BE(rawData, rawDataIndex + 4)), entrance(rawData[rawDataIndex + 6]), - flag(rawData[rawDataIndex + 7]) -{ -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.h deleted file mode 100644 index b1d175fec..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetCutscenes.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "ZCutscene.h" -#include "ZRoom/ZRoomCommand.h" - -class CutsceneEntry -{ -public: - CutsceneEntry(const std::vector& rawData, uint32_t rawDataIndex); - - segptr_t segmentPtr; - uint16_t exit; - uint8_t entrance; - uint8_t flag; -}; - -class SetCutscenes : public ZRoomCommand -{ -public: - std::vector cutscenes; - std::vector cutsceneEntries; // (MM Only) - uint8_t numCutscenes; // (MM Only) - - SetCutscenes(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.cpp deleted file mode 100644 index 79a278bc6..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "SetEchoSettings.h" -#include "Utils/StringHelper.h" - -SetEchoSettings::SetEchoSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetEchoSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - echo = parent->GetRawData().at(rawDataIndex + 0x07); -} - -std::string SetEchoSettings::GetBodySourceCode() const -{ - return StringHelper::Sprintf("SCENE_CMD_ECHO_SETTINGS(%i)", echo); -} - -std::string SetEchoSettings::GetCommandCName() const -{ - return "SCmdEchoSettings"; -} - -RoomCommand SetEchoSettings::GetRoomCommand() const -{ - return RoomCommand::SetEchoSettings; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.h deleted file mode 100644 index 82b8c27db..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetEchoSettings.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetEchoSettings : public ZRoomCommand -{ -public: - uint8_t echo; - - SetEchoSettings(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.cpp deleted file mode 100644 index 6749e1770..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.cpp +++ /dev/null @@ -1,91 +0,0 @@ -#include "SetEntranceList.h" - -#include "Globals.h" -#include "SetStartPositionList.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetEntranceList::SetEntranceList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetEntranceList::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (segmentOffset != 0) - { - std::string varName = - StringHelper::Sprintf("%sEntranceList0x%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationPlaceholder(segmentOffset, varName); - } -} - -void SetEntranceList::ParseRawDataLate() -{ - // Parse Entrances and Generate Declaration - uint32_t numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2; - uint32_t currentPtr = segmentOffset; - - entrances.reserve(numEntrances); - for (uint32_t i = 0; i < numEntrances; i++) - { - EntranceEntry entry(parent->GetRawData(), currentPtr); - entrances.push_back(entry); - - currentPtr += 2; - } -} - -void SetEntranceList::DeclareReferencesLate([[maybe_unused]] const std::string& prefix) -{ - if (!entrances.empty()) - { - std::string declaration; - - size_t index = 0; - for (const auto& entry : entrances) - { - declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); - if (index + 1 < entrances.size()) - declaration += "\n"; - - index++; - } - - std::string varName = - StringHelper::Sprintf("%sEntranceList0x%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationArray(segmentOffset, DeclarationAlignment::Align4, - entrances.size() * 2, "EntranceEntry", varName, - entrances.size(), declaration); - } -} - -std::string SetEntranceList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "EntranceEntry", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ENTRANCE_LIST(%s)", listName.c_str()); -} - -std::string SetEntranceList::GetCommandCName() const -{ - return "SCmdEntranceList"; -} - -RoomCommand SetEntranceList::GetRoomCommand() const -{ - return RoomCommand::SetEntranceList; -} - -EntranceEntry::EntranceEntry(const std::vector& rawData, uint32_t rawDataIndex) -{ - startPositionIndex = rawData.at(rawDataIndex + 0); - roomToLoad = rawData.at(rawDataIndex + 1); -} - -std::string EntranceEntry::GetBodySourceCode() const -{ - return StringHelper::Sprintf("0x%02X, 0x%02X", startPositionIndex, roomToLoad); -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.h deleted file mode 100644 index e13e9a8ce..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetEntranceList.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class EntranceEntry -{ -public: - uint8_t startPositionIndex; - uint8_t roomToLoad; - - EntranceEntry(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; -}; - -class SetEntranceList : public ZRoomCommand -{ -public: - std::vector entrances; - - SetEntranceList(ZFile* nParent); - - void DeclareReferences(const std::string& prefix) override; - void ParseRawDataLate() override; - void DeclareReferencesLate(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.cpp deleted file mode 100644 index 3b9ce2dfa..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.cpp +++ /dev/null @@ -1,76 +0,0 @@ -#include "SetExitList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZNames.h" -#include "ZRoom/ZRoom.h" - -SetExitList::SetExitList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetExitList::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (segmentOffset != 0) - { - std::string varName = - StringHelper::Sprintf("%sExitList_%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationPlaceholder(segmentOffset, varName); - } -} - -void SetExitList::ParseRawDataLate() -{ - // Parse Entrances and Generate Declaration - uint32_t numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2; - uint32_t currentPtr = segmentOffset; - - exits.reserve(numEntrances); - for (uint32_t i = 0; i < numEntrances; i++) - { - uint16_t exit = BitConverter::ToUInt16BE(parent->GetRawData(), currentPtr); - exits.push_back(exit); - - currentPtr += 2; - } -} - -void SetExitList::DeclareReferencesLate([[maybe_unused]] const std::string& prefix) -{ - if (!exits.empty()) - { - std::string declaration; - - for (size_t i = 0; i < exits.size(); i++) - { - declaration += - StringHelper::Sprintf(" %s,", ZNames::GetEntranceName(exits[i]).c_str()); - if (i + 1 < exits.size()) - declaration += "\n"; - } - - std::string varName = - StringHelper::Sprintf("%sExitList_%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationArray(segmentOffset, DeclarationAlignment::Align4, exits.size() * 2, - "u16", varName, exits.size(), declaration); - } -} - -std::string SetExitList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "u16", listName, parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_EXIT_LIST(%s)", listName.c_str()); -} - -std::string SetExitList::GetCommandCName() const -{ - return "SCmdExitList"; -} - -RoomCommand SetExitList::GetRoomCommand() const -{ - return RoomCommand::SetExitList; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.h deleted file mode 100644 index 9d2791a83..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetExitList.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetExitList : public ZRoomCommand -{ -public: - std::vector exits; - - SetExitList(ZFile* nParent); - - void DeclareReferences(const std::string& prefix) override; - void ParseRawDataLate() override; - void DeclareReferencesLate(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.cpp deleted file mode 100644 index 4c551be13..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.cpp +++ /dev/null @@ -1,100 +0,0 @@ -#include "SetLightList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -SetLightList::SetLightList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetLightList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - std::string declarations; - - numLights = cmdArg1; - int32_t currentPtr = segmentOffset; - - lights.reserve(this->numLights); - for (int i = 0; i < this->numLights; i++) - { - LightInfo light(parent->GetRawData(), currentPtr); - - currentPtr += light.GetRawDataSize(); - lights.push_back(light); - } -} - -void SetLightList::DeclareReferences(const std::string& prefix) -{ - if (!lights.empty()) - { - std::string declarations; - - for (size_t i = 0; i < lights.size(); i++) - { - declarations += - StringHelper::Sprintf("\t{ %s },", lights.at(i).GetBodySourceCode().c_str()); - - if (i < lights.size() - 1) - declarations += "\n"; - } - - const auto& light = lights.front(); - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, lights.size() * light.GetRawDataSize(), - light.GetSourceTypeName(), - StringHelper::Sprintf("%sLightInfo0x%06X", prefix.c_str(), segmentOffset), - lights.size(), declarations); - } -} - -std::string SetLightList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "LightInfo", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_LIGHT_LIST(%i, %s)", numLights, listName.c_str()); -} - -std::string SetLightList::GetCommandCName() const -{ - return "SCmdLightList"; -} - -RoomCommand SetLightList::GetRoomCommand() const -{ - return RoomCommand::SetLightList; -} - -LightInfo::LightInfo(const std::vector& rawData, uint32_t rawDataIndex) -{ - type = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0); - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - r = BitConverter::ToUInt8BE(rawData, rawDataIndex + 8); - g = BitConverter::ToUInt8BE(rawData, rawDataIndex + 9); - b = BitConverter::ToUInt8BE(rawData, rawDataIndex + 10); - drawGlow = BitConverter::ToUInt8BE(rawData, rawDataIndex + 11); - radius = BitConverter::ToInt16BE(rawData, rawDataIndex + 12); -} - -std::string LightInfo::GetBodySourceCode() const -{ - return StringHelper::Sprintf( - "0x%02X, { %i, %i, %i, { 0x%02X, 0x%02X, 0x%02X }, 0x%02X, 0x%04X }", type, x, y, z, r, g, - b, drawGlow, radius); -} - -std::string LightInfo::GetSourceTypeName() const -{ - return "LightInfo"; -} - -size_t LightInfo::GetRawDataSize() const -{ - return 0x0E; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.h deleted file mode 100644 index 894a21530..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightList.h +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include - -#include "ZFile.h" -#include "ZRoom/ZRoom.h" -#include "ZRoom/ZRoomCommand.h" - -class LightInfo -{ -public: - LightInfo(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - - std::string GetSourceTypeName() const; - size_t GetRawDataSize() const; - -public: - uint8_t type; - int16_t x, y, z; - uint8_t r, g, b; - uint8_t drawGlow; - int16_t radius; -}; - -class SetLightList : public ZRoomCommand -{ -public: - uint8_t numLights; - std::vector lights; - - SetLightList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.cpp deleted file mode 100644 index 547862a52..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.cpp +++ /dev/null @@ -1,107 +0,0 @@ -#include "SetLightingSettings.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetLightingSettings::SetLightingSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetLightingSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - uint8_t numLights = cmdArg1; - - settings.reserve(numLights); - for (int i = 0; i < numLights; i++) - settings.push_back(LightingSettings(parent->GetRawData(), segmentOffset + (i * 22))); -} - -void SetLightingSettings::DeclareReferences(const std::string& prefix) -{ - if (settings.size() > 0) - { - std::string declaration; - - for (size_t i = 0; i < settings.size(); i++) - { - declaration += - StringHelper::Sprintf("\t{ %s },", settings.at(i).GetBodySourceCode().c_str()); - if (i + 1 < settings.size()) - declaration += "\n"; - } - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, - settings.size() * settings.front().GetRawDataSize(), "LightSettings", - StringHelper::Sprintf("%sLightSettings0x%06X", prefix.c_str(), segmentOffset), - settings.size(), declaration); - } -} - -std::string SetLightingSettings::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "LightSettings", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ENV_LIGHT_SETTINGS(%i, %s)", settings.size(), - listName.c_str()); -} - -std::string SetLightingSettings::GetCommandCName() const -{ - return "SCmdLightSettingList"; -} - -RoomCommand SetLightingSettings::GetRoomCommand() const -{ - return RoomCommand::SetLightingSettings; -} - -LightingSettings::LightingSettings(const std::vector& rawData, uint32_t rawDataIndex) -{ - ambientClrR = rawData.at(rawDataIndex + 0); - ambientClrG = rawData.at(rawDataIndex + 1); - ambientClrB = rawData.at(rawDataIndex + 2); - - diffuseClrA_R = rawData.at(rawDataIndex + 3); - diffuseClrA_G = rawData.at(rawDataIndex + 4); - diffuseClrA_B = rawData.at(rawDataIndex + 5); - - diffuseDirA_X = rawData.at(rawDataIndex + 6); - diffuseDirA_Y = rawData.at(rawDataIndex + 7); - diffuseDirA_Z = rawData.at(rawDataIndex + 8); - - diffuseClrB_R = rawData.at(rawDataIndex + 9); - diffuseClrB_G = rawData.at(rawDataIndex + 10); - diffuseClrB_B = rawData.at(rawDataIndex + 11); - - diffuseDirB_X = rawData.at(rawDataIndex + 12); - diffuseDirB_Y = rawData.at(rawDataIndex + 13); - diffuseDirB_Z = rawData.at(rawDataIndex + 14); - - fogClrR = rawData.at(rawDataIndex + 15); - fogClrG = rawData.at(rawDataIndex + 16); - fogClrB = rawData.at(rawDataIndex + 17); - - unk = BitConverter::ToInt16BE(rawData, rawDataIndex + 18); - drawDistance = BitConverter::ToInt16BE(rawData, rawDataIndex + 20); -} - -std::string LightingSettings::GetBodySourceCode() const -{ - return StringHelper::Sprintf( - "0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, " - "0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%04X, 0x%04X", - ambientClrR, ambientClrG, ambientClrB, diffuseClrA_R, diffuseClrA_G, diffuseClrA_B, - diffuseDirA_X, diffuseDirA_Y, diffuseDirA_Z, diffuseClrB_R, diffuseClrB_G, diffuseClrB_B, - diffuseDirB_X, diffuseDirB_Y, diffuseDirB_Z, fogClrR, fogClrG, fogClrB, unk, drawDistance); -} - -size_t LightingSettings::GetRawDataSize() const -{ - return 0x16; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.h deleted file mode 100644 index 29caf4aa6..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetLightingSettings.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class LightingSettings -{ -public: - uint8_t ambientClrR, ambientClrG, ambientClrB; - uint8_t diffuseClrA_R, diffuseClrA_G, diffuseClrA_B; - uint8_t diffuseDirA_X, diffuseDirA_Y, diffuseDirA_Z; - uint8_t diffuseClrB_R, diffuseClrB_G, diffuseClrB_B; - uint8_t diffuseDirB_X, diffuseDirB_Y, diffuseDirB_Z; - uint8_t fogClrR, fogClrG, fogClrB; - uint16_t unk; - uint16_t drawDistance; - - LightingSettings(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - - size_t GetRawDataSize() const; -}; - -class SetLightingSettings : public ZRoomCommand -{ -public: - std::vector settings; - - SetLightingSettings(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.cpp deleted file mode 100644 index c6f2d7dca..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.cpp +++ /dev/null @@ -1,616 +0,0 @@ -#include "SetMesh.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZBackground.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -void GenDListDeclarations(ZRoom* zRoom, ZFile* parent, ZDisplayList* dList); - -SetMesh::SetMesh(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetMesh::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - auto& parentRawData = parent->GetRawData(); - meshHeaderType = parentRawData.at(segmentOffset); - - switch (meshHeaderType) - { - case 0: - polyType = std::make_shared(parent, segmentOffset, zRoom); - break; - - case 1: - polyType = std::make_shared(parent, segmentOffset, zRoom); - break; - - case 2: - polyType = std::make_shared(parent, segmentOffset, zRoom); - break; - - default: - HANDLE_ERROR(WarningType::InvalidExtractedData, - StringHelper::Sprintf("unknown meshHeaderType: %i", meshHeaderType), ""); - } - - polyType->ParseRawData(); -} - -void SetMesh::DeclareReferences(const std::string& prefix) -{ - polyType->SetName(polyType->GetDefaultName(prefix)); - polyType->DeclareReferences(prefix); - polyType->DeclareAndGenerateOutputCode(prefix); -} - -// TODO: is this really needed? -void GenDListDeclarations(ZRoom* zRoom, ZFile* parent, ZDisplayList* dList) -{ - if (dList == nullptr) - return; - - dList->DeclareReferences(zRoom->GetName()); - - for (ZDisplayList* otherDList : dList->otherDLists) - GenDListDeclarations(zRoom, parent, otherDList); -} - -std::string SetMesh::GenDListExterns(ZDisplayList* dList) -{ - std::string sourceOutput; - - sourceOutput += StringHelper::Sprintf("extern Gfx %sDL_%06X[];\n", zRoom->GetName().c_str(), - dList->GetRawDataIndex()); - - for (ZDisplayList* otherDList : dList->otherDLists) - sourceOutput += GenDListExterns(otherDList); - - return sourceOutput; -} - -std::string SetMesh::GetBodySourceCode() const -{ - std::string list; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "", list, parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_MESH(%s)", list.c_str()); -} - -std::string SetMesh::GetCommandCName() const -{ - return "SCmdMesh"; -} - -RoomCommand SetMesh::GetRoomCommand() const -{ - return RoomCommand::SetMesh; -} - -PolygonDlist::PolygonDlist(ZFile* nParent) : ZResource(nParent) -{ -} - -void PolygonDlist::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - switch (polyType) - { - case 2: - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - unk_06 = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - - opa = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - xlu = BitConverter::ToUInt32BE(rawData, rawDataIndex + 12); - break; - - default: - opa = BitConverter::ToUInt32BE(rawData, rawDataIndex); - xlu = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); - break; - } -} - -void PolygonDlist::DeclareReferences(const std::string& prefix) -{ - opaDList = MakeDlist(opa, prefix); - xluDList = MakeDlist(xlu, prefix); -} - -std::string PolygonDlist::GetBodySourceCode() const -{ - std::string bodyStr; - std::string opaStr; - std::string xluStr; - Globals::Instance->GetSegmentedPtrName(opa, parent, "Gfx", opaStr, parent->workerID); - Globals::Instance->GetSegmentedPtrName(xlu, parent, "Gfx", xluStr, parent->workerID); - - if (polyType == 2) - { - bodyStr += StringHelper::Sprintf("{ %6i, %6i, %6i }, %6i, ", x, y, z, unk_06); - } - - bodyStr += StringHelper::Sprintf("%s, %s", opaStr.c_str(), xluStr.c_str()); - - return bodyStr; -} - -void PolygonDlist::GetSourceOutputCode(const std::string& prefix) -{ - std::string bodyStr = StringHelper::Sprintf("\n\t%s\n", GetBodySourceCode().c_str()); - - Declaration* decl = parent->GetDeclaration(rawDataIndex); - - if (decl == nullptr) - DeclareVar(prefix, bodyStr); - else - decl->text = bodyStr; -} - -std::string PolygonDlist::GetSourceTypeName() const -{ - switch (polyType) - { - case 2: - return "PolygonDlist2"; - - default: - return "PolygonDlist"; - } -} - -ZResourceType PolygonDlist::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t PolygonDlist::GetRawDataSize() const -{ - switch (polyType) - { - case 2: - return 0x10; - - default: - return 0x08; - } -} - -void PolygonDlist::SetPolyType(uint8_t nPolyType) -{ - polyType = nPolyType; -} - -ZDisplayList* PolygonDlist::MakeDlist(segptr_t ptr, [[maybe_unused]] const std::string& prefix) -{ - if (ptr == 0) - { - return nullptr; - } - - uint32_t dlistAddress = Seg2Filespace(ptr, parent->baseAddress); - - int32_t dlistLength = ZDisplayList::GetDListLength( - parent->GetRawData(), dlistAddress, - Globals::Instance->game == ZGame::OOT_SW97 ? DListType::F3DEX : DListType::F3DZEX); - ZDisplayList* dlist = new ZDisplayList(parent); - parent->AddResource(dlist); - dlist->ExtractFromBinary(dlistAddress, dlistLength); - dlist->SetName(dlist->GetDefaultName(prefix)); - GenDListDeclarations(zRoom, parent, dlist); - - return dlist; -} - -/* BgImage */ - -BgImage::BgImage(ZFile* nParent) : ZResource(nParent) -{ -} - -BgImage::BgImage(bool nIsSubStruct, const std::string& prefix, uint32_t nRawDataIndex, - ZFile* nParent) - : BgImage(nParent) -{ - rawDataIndex = nRawDataIndex; - parent = nParent; - isSubStruct = nIsSubStruct; - - name = GetDefaultName(prefix); - - ParseRawData(); - sourceBackground = MakeBackground(source, prefix); -} - -void BgImage::ParseRawData() -{ - size_t pad = 0x00; - const auto& rawData = parent->GetRawData(); - if (!isSubStruct) - { - pad = 0x04; - - unk_00 = BitConverter::ToUInt16BE(rawData, rawDataIndex + 0x00); - id = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x02); - } - source = BitConverter::ToUInt32BE(rawData, rawDataIndex + pad + 0x00); - unk_0C = BitConverter::ToUInt32BE(rawData, rawDataIndex + pad + 0x04); - tlut = BitConverter::ToUInt32BE(rawData, rawDataIndex + pad + 0x08); - width = BitConverter::ToUInt16BE(rawData, rawDataIndex + pad + 0x0C); - height = BitConverter::ToUInt16BE(rawData, rawDataIndex + pad + 0x0E); - fmt = BitConverter::ToUInt8BE(rawData, rawDataIndex + pad + 0x10); - siz = BitConverter::ToUInt8BE(rawData, rawDataIndex + pad + 0x11); - mode0 = BitConverter::ToUInt16BE(rawData, rawDataIndex + pad + 0x12); - tlutCount = BitConverter::ToUInt16BE(rawData, rawDataIndex + pad + 0x14); -} - -ZBackground* BgImage::MakeBackground(segptr_t ptr, const std::string& prefix) -{ - if (ptr == 0) - return nullptr; - - uint32_t backAddress = Seg2Filespace(ptr, parent->baseAddress); - - ZBackground* background = new ZBackground(parent); - background->ExtractFromFile(backAddress); - - std::string defaultName = background->GetDefaultName(prefix); - background->SetName(defaultName); - background->SetOutName(defaultName); - - background->DeclareVar(prefix, ""); - parent->resources.push_back(background); - - return background; -} - -size_t BgImage::GetRawDataSize() const -{ - return 0x1C; -} - -std::string BgImage::GetBodySourceCode() const -{ - std::string bodyStr = " "; - if (!isSubStruct) - { - bodyStr += "{ \n "; - } - - if (!isSubStruct) - { - bodyStr += StringHelper::Sprintf("0x%04X, ", unk_00); - bodyStr += StringHelper::Sprintf("%i, ", id); - bodyStr += "\n "; - bodyStr += " "; - } - - std::string backgroundName; - Globals::Instance->GetSegmentedPtrName(source, parent, "", backgroundName, parent->workerID); - bodyStr += StringHelper::Sprintf("%s, ", backgroundName.c_str()); - bodyStr += "\n "; - if (!isSubStruct) - { - bodyStr += " "; - } - - bodyStr += StringHelper::Sprintf("0x%08X, ", unk_0C); - bodyStr += StringHelper::Sprintf("0x%08X, ", tlut); - bodyStr += "\n "; - if (!isSubStruct) - { - bodyStr += " "; - } - - bodyStr += StringHelper::Sprintf("%i, ", width); - bodyStr += StringHelper::Sprintf("%i, ", height); - bodyStr += "\n "; - if (!isSubStruct) - { - bodyStr += " "; - } - - bodyStr += StringHelper::Sprintf("%i, ", fmt); - bodyStr += StringHelper::Sprintf("%i, ", siz); - bodyStr += "\n "; - if (!isSubStruct) - { - bodyStr += " "; - } - - bodyStr += StringHelper::Sprintf("0x%04X, ", mode0); - bodyStr += StringHelper::Sprintf("0x%04X, ", tlutCount); - if (!isSubStruct) - { - bodyStr += " \n }, "; - } - else - { - bodyStr += "\n"; - } - - return bodyStr; -} - -std::string BgImage::GetSourceTypeName() const -{ - return "BgImage"; -} - -ZResourceType BgImage::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -/* PolygonType section */ - -PolygonTypeBase::PolygonTypeBase(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom) - : ZResource(nParent), zRoom{nRoom} -{ - rawDataIndex = nRawDataIndex; - type = BitConverter::ToUInt8BE(parent->GetRawData(), rawDataIndex); -} - -void PolygonTypeBase::DeclareAndGenerateOutputCode(const std::string& prefix) -{ - std::string bodyStr = GetBodySourceCode(); - - Declaration* decl = parent->GetDeclaration(rawDataIndex); - if (decl == nullptr) - { - DeclareVar(prefix, bodyStr); - } - else - { - decl->text = bodyStr; - } -} - -std::string PolygonTypeBase::GetSourceTypeName() const -{ - switch (type) - { - case 2: - return "PolygonType2"; - - case 1: - return "PolygonType1"; - - default: - return "PolygonType0"; - } -} - -ZResourceType PolygonTypeBase::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -PolygonType1::PolygonType1(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom) - : PolygonTypeBase(nParent, nRawDataIndex, nRoom), single(nParent) -{ -} - -void PolygonType1::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - format = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x01); - dlist = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x04); - - if (format == 2) - { - count = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x08); - list = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x0C); - } - - if (dlist != 0) - { - PolygonDlist polyGfxList(parent); - polyGfxList.zRoom = zRoom; - polyGfxList.SetPolyType(type); - polyGfxList.ExtractFromFile(Seg2Filespace(dlist, parent->baseAddress)); - polyGfxList.DeclareReferences(zRoom->GetName()); - polyDLists.push_back(polyGfxList); - } -} - -void PolygonType1::DeclareReferences(const std::string& prefix) -{ - polyDLists.at(0).GetSourceOutputCode(prefix); - - uint32_t listAddress; - std::string bgImageArrayBody; - switch (format) - { - case 1: - single = BgImage(true, prefix, rawDataIndex + 0x08, parent); - break; - - case 2: - if (list != 0) - { - listAddress = Seg2Filespace(list, parent->baseAddress); - uint32_t auxPtr = listAddress; - - multiList.reserve(count); - for (size_t i = 0; i < count; ++i) - { - BgImage bg(false, prefix, auxPtr, parent); - multiList.push_back(bg); - auxPtr += bg.GetRawDataSize(); - bgImageArrayBody += bg.GetBodySourceCode(); - if (i + 1 < count) - { - bgImageArrayBody += "\n"; - } - } - - Declaration* decl = parent->GetDeclaration(listAddress); - if (decl == nullptr) - { - parent->AddDeclarationArray( - listAddress, DeclarationAlignment::Align4, - count * multiList.at(0).GetRawDataSize(), multiList.at(0).GetSourceTypeName(), - multiList.at(0).GetName().c_str(), count, bgImageArrayBody); - } - } - break; - - default: - HANDLE_ERROR(WarningType::InvalidExtractedData, - StringHelper::Sprintf("unknown format: %i", format), ""); - break; - } -} - -size_t PolygonType1::GetRawDataSize() const -{ - switch (format) - { - case 1: - return 0x20; - - case 2: - return 0x10; - } - return 0x20; -} - -std::string PolygonType1::GetBodySourceCode() const -{ - std::string bodyStr = "\n "; - - bodyStr += "{ "; - bodyStr += StringHelper::Sprintf("%i, %i, ", type, format); - - std::string dlistStr; - Globals::Instance->GetSegmentedPtrName(dlist, parent, "", dlistStr, parent->workerID); - - bodyStr += StringHelper::Sprintf("%s, ", dlistStr.c_str()); - bodyStr += "}, \n"; - - std::string listStr = "NULL"; - switch (format) - { - case 1: - bodyStr += single.GetBodySourceCode(); - break; - case 2: - Globals::Instance->GetSegmentedPtrName(list, parent, "BgImage", listStr, parent->workerID); - bodyStr += StringHelper::Sprintf(" %i, %s, \n", count, listStr.c_str()); - break; - - default: - break; - } - - return bodyStr; -} - -std::string PolygonType1::GetSourceTypeName() const -{ - switch (format) - { - case 1: - return "MeshHeader1Single"; - - case 2: - return "MeshHeader1Multi"; - } - return "ERROR"; - // return "PolygonType1"; -} - -PolygonType2::PolygonType2(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom) - : PolygonTypeBase(nParent, nRawDataIndex, nRoom) -{ -} - -void PolygonType2::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - num = BitConverter::ToUInt8BE(rawData, rawDataIndex + 0x01); - - start = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x04); - end = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0x08); - - uint32_t currentPtr = GETSEGOFFSET(start); - - polyDLists.reserve(num); - for (size_t i = 0; i < num; i++) - { - PolygonDlist entry(parent); - entry.zRoom = zRoom; - entry.SetPolyType(type); - entry.ExtractFromFile(currentPtr); - entry.DeclareReferences(zRoom->GetName()); - polyDLists.push_back(entry); - currentPtr += entry.GetRawDataSize(); - } -} - -void PolygonType2::DeclareReferences(const std::string& prefix) -{ - if (num > 0) - { - std::string declaration; - - for (size_t i = 0; i < polyDLists.size(); i++) - { - declaration += - StringHelper::Sprintf("\t{ %s },", polyDLists.at(i).GetBodySourceCode().c_str()); - if (i + 1 < polyDLists.size()) - declaration += "\n"; - } - - std::string polyDlistType = polyDLists.at(0).GetSourceTypeName(); - std::string polyDListName; - polyDListName = StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), polyDlistType.c_str(), - GETSEGOFFSET(start)); - - Declaration* decl = parent->AddDeclarationArray( - GETSEGOFFSET(start), DeclarationAlignment::Align4, - polyDLists.size() * polyDLists.at(0).GetRawDataSize(), polyDlistType, polyDListName, - polyDLists.size(), declaration); - decl->forceArrayCnt = true; - } - - parent->AddDeclaration(GETSEGOFFSET(end), DeclarationAlignment::Align4, 4, "s32", - StringHelper::Sprintf("%s_terminatorMaybe_%06X", - parent->GetName().c_str(), GETSEGOFFSET(end)), - "0x01000000"); -} - -std::string PolygonType2::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(start, parent, "", listName, parent->workerID); - - std::string body = StringHelper::Sprintf("\n %i, %i,\n", type, polyDLists.size()); - body += StringHelper::Sprintf(" %s,\n", listName.c_str()); - body += - StringHelper::Sprintf(" %s + ARRAY_COUNTU(%s)\n", listName.c_str(), listName.c_str()); - return body; -} - -size_t PolygonType2::GetRawDataSize() const -{ - return 0x0C; -} - -DeclarationAlignment PolygonType2::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align4; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.h deleted file mode 100644 index 9d9037417..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMesh.h +++ /dev/null @@ -1,159 +0,0 @@ -#pragma once - -#include -#include "ZBackground.h" -#include "ZDisplayList.h" -#include "ZRoom/ZRoomCommand.h" - -class PolygonDlist : public ZResource -{ -public: - ZRoom* zRoom; - - uint8_t polyType; - - int16_t x, y, z; // polyType == 2 - int16_t unk_06; // polyType == 2 - - segptr_t opa = 0; // Gfx* - segptr_t xlu = 0; // Gfx* - - ZDisplayList* opaDList = nullptr; // Gfx* - ZDisplayList* xluDList = nullptr; // Gfx* - - PolygonDlist(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - void GetSourceOutputCode(const std::string& prefix) override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - - void SetPolyType(uint8_t nPolyType); - -protected: - ZDisplayList* MakeDlist(segptr_t ptr, const std::string& prefix); -}; - -class BgImage : public ZResource -{ -public: - uint16_t unk_00; - uint8_t id; - segptr_t source; - uint32_t unk_0C; - uint32_t tlut; - uint16_t width; - uint16_t height; - uint8_t fmt; - uint8_t siz; - uint16_t mode0; - uint16_t tlutCount; - - ZBackground* sourceBackground; - - bool isSubStruct; - - BgImage(ZFile* nParent); - BgImage(bool nIsSubStruct, const std::string& prefix, uint32_t nRawDataIndex, ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -protected: - ZBackground* MakeBackground(segptr_t ptr, const std::string& prefix); -}; - -class PolygonTypeBase : public ZResource -{ -public: - uint8_t type; - std::vector polyDLists; - - PolygonTypeBase(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom); - - void DeclareAndGenerateOutputCode(const std::string& prefix); - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - -protected: - ZRoom* zRoom; -}; - -class PolygonType1 : public PolygonTypeBase -{ -public: - uint8_t format; - segptr_t dlist; - - // single - BgImage single; - - // multi - uint8_t count; - segptr_t list; // BgImage* - std::vector multiList; - - PolygonType1(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - - size_t GetRawDataSize() const override; -}; - -class PolygonType2 : public PolygonTypeBase -{ -public: - uint8_t num; - segptr_t start; - segptr_t end; - - PolygonType2(ZFile* nParent, uint32_t nRawDataIndex, ZRoom* nRoom); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; -}; - -class SetMesh : public ZRoomCommand -{ -public: - uint8_t data; - uint8_t meshHeaderType; - std::shared_ptr polyType; - - SetMesh(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; - -private: - std::string GenDListExterns(ZDisplayList* dList); -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.cpp deleted file mode 100644 index 25bfae703..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.cpp +++ /dev/null @@ -1,83 +0,0 @@ -#include "SetMinimapChests.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetMinimapChests::SetMinimapChests(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetMinimapChests::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - int numChests = cmdArg1; - - offset_t currentPtr = segmentOffset; - - chests.reserve(numChests); - for (int32_t i = 0; i < numChests; i++) - { - MinimapChest chest(parent->GetRawData(), currentPtr); - chests.push_back(chest); - - currentPtr += 10; - } -} - -void SetMinimapChests::DeclareReferences(const std::string& prefix) -{ - std::string declaration; - - size_t index = 0; - for (const auto& chest : chests) - { - declaration += StringHelper::Sprintf(" { %s },", chest.GetBodySourceCode().c_str()); - - if (index < chests.size() - 1) - declaration += "\n"; - - index++; - } - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, chests.size() * 10, "MinimapChest", - StringHelper::Sprintf("%sMinimapChests0x%06X", prefix.c_str(), segmentOffset), - chests.size(), declaration); -} - -std::string SetMinimapChests::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "MinimapChest", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_MINIMAP_COMPASS_ICON_INFO(0x%02X, %s)", chests.size(), - listName.c_str()); -} - -std::string SetMinimapChests::GetCommandCName() const -{ - return "SCmdMinimapChests"; -} - -RoomCommand SetMinimapChests::GetRoomCommand() const -{ - return RoomCommand::SetMinimapChests; -} - -MinimapChest::MinimapChest(const std::vector& rawData, uint32_t rawDataIndex) - : unk0(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)), - unk2(BitConverter::ToUInt16BE(rawData, rawDataIndex + 2)), - unk4(BitConverter::ToUInt16BE(rawData, rawDataIndex + 4)), - unk6(BitConverter::ToUInt16BE(rawData, rawDataIndex + 6)), - unk8(BitConverter::ToUInt16BE(rawData, rawDataIndex + 8)) -{ -} - -std::string MinimapChest::GetBodySourceCode() const -{ - return StringHelper::Sprintf("0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X", unk0, unk2, unk4, unk6, - unk8); -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.h deleted file mode 100644 index 0db09a8a2..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapChests.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class MinimapChest -{ -public: - MinimapChest(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - -protected: - uint16_t unk0; - uint16_t unk2; - uint16_t unk4; - uint16_t unk6; - uint16_t unk8; -}; - -class SetMinimapChests : public ZRoomCommand -{ -public: - std::vector chests; - - SetMinimapChests(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.cpp deleted file mode 100644 index e02e1a92b..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.cpp +++ /dev/null @@ -1,98 +0,0 @@ -#include "SetMinimapList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetMinimapList::SetMinimapList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetMinimapList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - listSegmentAddr = BitConverter::ToInt32BE(parent->GetRawData(), segmentOffset); - listSegmentOffset = GETSEGOFFSET(listSegmentAddr); - unk4 = BitConverter::ToInt32BE(parent->GetRawData(), segmentOffset + 4); - - uint32_t currentPtr = listSegmentOffset; - - minimaps.reserve(zRoom->roomCount); - for (int32_t i = 0; i < zRoom->roomCount; i++) - { - MinimapEntry entry(parent->GetRawData(), currentPtr); - minimaps.push_back(entry); - - currentPtr += 10; - } -} - -void SetMinimapList::DeclareReferences(const std::string& prefix) -{ - { - std::string declaration; - - size_t index = 0; - for (const auto& entry : minimaps) - { - declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); - - if (index < minimaps.size() - 1) - declaration += "\n"; - - index++; - } - - parent->AddDeclarationArray( - listSegmentOffset, DeclarationAlignment::Align4, minimaps.size() * 10, "MinimapEntry", - StringHelper::Sprintf("%sMinimapEntryList0x%06X", prefix.c_str(), listSegmentOffset), - minimaps.size(), declaration); - } - - { - std::string listName; - Globals::Instance->GetSegmentedPtrName(listSegmentAddr, parent, "MinimapEntry", listName, - parent->workerID); - std::string declaration = StringHelper::Sprintf("\n\t%s, 0x%08X\n", listName.c_str(), unk4); - - parent->AddDeclaration( - segmentOffset, DeclarationAlignment::Align4, 8, "MinimapList", - StringHelper::Sprintf("%sMinimapList0x%06X", prefix.c_str(), segmentOffset), - declaration); - } -} - -std::string SetMinimapList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "MinimapList", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_MINIMAP_INFO(%s)", listName.c_str()); -} - -std::string SetMinimapList::GetCommandCName() const -{ - return "SCmdMinimapSettings"; -} - -RoomCommand SetMinimapList::GetRoomCommand() const -{ - return RoomCommand::SetMinimapList; -} - -MinimapEntry::MinimapEntry(const std::vector& rawData, uint32_t rawDataIndex) - : unk0(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)), - unk2(BitConverter::ToUInt16BE(rawData, rawDataIndex + 2)), - unk4(BitConverter::ToUInt16BE(rawData, rawDataIndex + 4)), - unk6(BitConverter::ToUInt16BE(rawData, rawDataIndex + 6)), - unk8(BitConverter::ToUInt16BE(rawData, rawDataIndex + 8)) -{ -} - -std::string MinimapEntry::GetBodySourceCode() const -{ - return StringHelper::Sprintf("0x%04X, 0x%04X, 0x%04X, 0x%04X, 0x%04X", unk0, unk2, unk4, unk6, - unk8); -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.h deleted file mode 100644 index 5b18b3dd7..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetMinimapList.h +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class MinimapEntry -{ -public: - MinimapEntry(const std::vector& rawData, uint32_t rawDataIndex); - - std::string GetBodySourceCode() const; - -protected: - uint16_t unk0; - uint16_t unk2; - uint16_t unk4; - uint16_t unk6; - uint16_t unk8; -}; - -class SetMinimapList : public ZRoomCommand -{ -public: - std::vector minimaps; - - SetMinimapList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; - -private: - segptr_t listSegmentAddr; - uint32_t listSegmentOffset; - uint32_t unk4; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.cpp deleted file mode 100644 index a8bb76a08..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include "SetObjectList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZNames.h" -#include "ZRoom/ZRoom.h" - -SetObjectList::SetObjectList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetObjectList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - uint8_t objectCnt = parent->GetRawData().at(rawDataIndex + 1); - uint32_t currentPtr = segmentOffset; - - objects.reserve(objectCnt); - for (uint8_t i = 0; i < objectCnt; i++) - { - uint16_t objectIndex = BitConverter::ToInt16BE(parent->GetRawData(), currentPtr); - objects.push_back(objectIndex); - currentPtr += 2; - } -} - -void SetObjectList::DeclareReferences(const std::string& prefix) -{ - if (!objects.empty()) - { - std::string declaration; - - for (size_t i = 0; i < objects.size(); i++) - { - uint16_t objectIndex = objects[i]; - declaration += - StringHelper::Sprintf(" %s,", ZNames::GetObjectName(objectIndex).c_str()); - - if (i < objects.size() - 1) - declaration += "\n"; - } - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, objects.size() * 2, "s16", - StringHelper::Sprintf("%sObjectList_%06X", prefix.c_str(), segmentOffset), - objects.size(), declaration); - } -} - -std::string SetObjectList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "s16", listName, parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_OBJECT_LIST(%i, %s)", objects.size(), listName.c_str()); -} - -std::string SetObjectList::GetCommandCName() const -{ - return "SCmdObjectList"; -} - -RoomCommand SetObjectList::GetRoomCommand() const -{ - return RoomCommand::SetObjectList; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.h deleted file mode 100644 index 03c159483..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetObjectList.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetObjectList : public ZRoomCommand -{ -public: - std::vector objects; - - SetObjectList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.cpp deleted file mode 100644 index f3bdb0872..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "SetPathways.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetPathways::SetPathways(ZFile* nParent) : ZRoomCommand(nParent), pathwayList(nParent) -{ -} - -void SetPathways::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (segmentOffset != 0) - { - std::string varName = - StringHelper::Sprintf("%sPathway_%06X", prefix.c_str(), segmentOffset); - parent->AddDeclarationPlaceholder(segmentOffset, varName); - } -} - -void SetPathways::ParseRawDataLate() -{ - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - auto numPaths = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 8; - pathwayList.SetNumPaths(numPaths); - } - - if (Globals::Instance->otrMode) - { - auto zPath = (ZPath*)parent->FindResource(segmentOffset); - - if (zPath != nullptr) - pathwayList = *zPath; - } - - pathwayList.ExtractFromFile(segmentOffset); -} - -void SetPathways::DeclareReferencesLate(const std::string& prefix) -{ - std::string varName = StringHelper::Sprintf("%sPathway_%06X", prefix.c_str(), segmentOffset); - pathwayList.SetName(varName); - pathwayList.DeclareReferences(prefix); - pathwayList.GetSourceOutputCode(prefix); -} - -std::string SetPathways::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "Path", listName, parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_PATH_LIST(%s)", listName.c_str()); -} - -std::string SetPathways::GetCommandCName() const -{ - return "SCmdPathList"; -} - -RoomCommand SetPathways::GetRoomCommand() const -{ - return RoomCommand::SetPathways; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.h deleted file mode 100644 index 9abc93d32..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetPathways.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "Vec3s.h" -#include "ZPath.h" -#include "ZResource.h" -#include "ZRoom/ZRoomCommand.h" - -class SetPathways : public ZRoomCommand -{ -public: - ZPath pathwayList; - - SetPathways(ZFile* nParent); - - void DeclareReferences(const std::string& prefix) override; - - void ParseRawDataLate() override; - void DeclareReferencesLate(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp deleted file mode 100644 index 8c6f4bf51..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "SetRoomBehavior.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -SetRoomBehavior::SetRoomBehavior(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetRoomBehavior::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - gameplayFlags = cmdArg1; - gameplayFlags2 = BitConverter::ToInt32BE(parent->GetRawData(), rawDataIndex + 0x04); - - currRoomUnk2 = gameplayFlags2 & 0xFF; - - currRoomUnk5 = showInvisActors = (gameplayFlags2 >> 8) & 1; - - msgCtxUnk = (gameplayFlags2 >> 10) & 1; - - enablePosLights = (gameplayFlags2 >> 11) & 1; - kankyoContextUnkE2 = (gameplayFlags2 >> 12) & 1; -} - -std::string SetRoomBehavior::GetBodySourceCode() const -{ - if (Globals::Instance->game == ZGame::MM_RETAIL) - { - std::string enableLights = StringHelper::BoolStr(enablePosLights); - return StringHelper::Sprintf("SCENE_CMD_ROOM_BEHAVIOR(0x%02X, 0x%02X, %i, %i, %s, %i)", - gameplayFlags, currRoomUnk2, currRoomUnk5, msgCtxUnk, - enableLights.c_str(), kankyoContextUnkE2); - } - std::string showInvisible = StringHelper::BoolStr(showInvisActors); - std::string disableWarps = StringHelper::BoolStr(msgCtxUnk); - return StringHelper::Sprintf("SCENE_CMD_ROOM_BEHAVIOR(0x%02X, 0x%02X, %s, %s)", gameplayFlags, - currRoomUnk2, showInvisible.c_str(), disableWarps.c_str()); -} - -std::string SetRoomBehavior::GetCommandCName() const -{ - return "SCmdRoomBehavior"; -} - -RoomCommand SetRoomBehavior::GetRoomCommand() const -{ - return RoomCommand::SetRoomBehavior; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.h deleted file mode 100644 index 47b772d77..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomBehavior.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetRoomBehavior : public ZRoomCommand -{ -public: - uint8_t gameplayFlags; - uint32_t gameplayFlags2; - - uint8_t currRoomUnk2; - - uint8_t showInvisActors; - uint8_t currRoomUnk5; - - uint8_t msgCtxUnk; - - uint8_t enablePosLights; - uint8_t kankyoContextUnkE2; - - SetRoomBehavior(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.cpp deleted file mode 100644 index abb2b003c..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.cpp +++ /dev/null @@ -1,155 +0,0 @@ -#include "SetRoomList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZRoom.h" - -SetRoomList::SetRoomList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetRoomList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - int numRooms = cmdArg1; - - romfile = new RomFile(parent); - romfile->numRooms = numRooms; - romfile->ExtractFromFile(segmentOffset); - - parent->resources.push_back(romfile); - - zRoom->roomCount = numRooms; -} - -void SetRoomList::DeclareReferences(const std::string& prefix) -{ - ZRoomCommand::DeclareReferences(prefix); - - romfile->DeclareVar(prefix, ""); -} - -std::string SetRoomList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "RomFile", listName, parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_ROOM_LIST(%i, %s)", romfile->rooms.size(), - listName.c_str()); -} - -std::string SetRoomList::GetCommandCName() const -{ - return "SCmdRoomList"; -} - -RoomCommand SetRoomList::GetRoomCommand() const -{ - return RoomCommand::SetRoomList; -} - -RomFile::RomFile(ZFile* nParent) : ZResource(nParent) -{ -} - -void RomFile::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - if (reader->Attribute("NumRooms") != nullptr) - { - numRooms = StringHelper::StrToL(std::string(reader->Attribute("NumRooms"))); - } -} - -void RomFile::ParseRawData() -{ - ZResource::ParseRawData(); - - uint32_t currentPtr = rawDataIndex; - - rooms.reserve(numRooms); - for (int32_t i = 0; i < numRooms; i++) - { - RoomEntry entry(parent->GetRawData(), currentPtr); - rooms.push_back(entry); - - currentPtr += 8; - } -} - -Declaration* RomFile::DeclareVar(const std::string& prefix, const std::string& body) -{ - std::string auxName = name; - if (name == "") - auxName = StringHelper::Sprintf("%sRoomList0x%06X", prefix.c_str(), rawDataIndex); - - return parent->AddDeclarationArray(rawDataIndex, DeclarationAlignment::Align4, - rooms.size() * rooms.at(0).GetRawDataSize(), - GetSourceTypeName(), auxName, rooms.size(), body); -} - -std::string RomFile::GetBodySourceCode() const -{ - std::string declaration; - bool isFirst = true; - - for (ZFile* file : Globals::Instance->files) - { - for (ZResource* res : file->resources) - { - if (res->GetResourceType() == ZResourceType::Room) - { - std::string roomName = res->GetName(); - if (!isFirst) - declaration += "\n"; - - declaration += StringHelper::Sprintf( - "\t{ (uintptr_t)_%sSegmentRomStart, (uintptr_t)_%sSegmentRomEnd },", - roomName.c_str(), roomName.c_str()); - isFirst = false; - } - } - } - - return declaration; -} - -void RomFile::GetSourceOutputCode(const std::string& prefix) -{ - DeclareVar(prefix, GetBodySourceCode()); -} - -std::string RomFile::GetSourceTypeName() const -{ - return "RomFile"; -} - -ZResourceType RomFile::GetResourceType() const -{ - // TODO - return ZResourceType::Error; -} - -size_t RomFile::GetRawDataSize() const -{ - return 8 * rooms.size(); -} - -RoomEntry::RoomEntry(uint32_t nVAS, uint32_t nVAE) -{ - virtualAddressStart = nVAS; - virtualAddressEnd = nVAE; -} - -RoomEntry::RoomEntry(const std::vector& rawData, uint32_t rawDataIndex) - : RoomEntry(BitConverter::ToInt32BE(rawData, rawDataIndex + 0), - BitConverter::ToInt32BE(rawData, rawDataIndex + 4)) -{ -} - -size_t RoomEntry::GetRawDataSize() const -{ - return 0x08; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.h deleted file mode 100644 index 2ae48b68d..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetRoomList.h +++ /dev/null @@ -1,53 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class RoomEntry -{ -public: - int32_t virtualAddressStart; - int32_t virtualAddressEnd; - - RoomEntry(uint32_t nVAS, uint32_t nVAE); - RoomEntry(const std::vector& rawData, uint32_t rawDataIndex); - - size_t GetRawDataSize() const; -}; - -class RomFile : public ZResource -{ -public: - RomFile(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& body) override; - std::string GetBodySourceCode() const override; - void GetSourceOutputCode(const std::string& prefix) override; - - std::string GetSourceTypeName() const override; - virtual ZResourceType GetResourceType() const override; - - virtual size_t GetRawDataSize() const override; - - uint8_t numRooms = 0; - std::vector rooms; -}; - -class SetRoomList : public ZRoomCommand -{ -public: - // Borrowed reference. Don't delete. - RomFile* romfile = nullptr; - - SetRoomList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp deleted file mode 100644 index b16f1355b..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "SetSkyboxModifier.h" - -#include "Utils/StringHelper.h" - -SetSkyboxModifier::SetSkyboxModifier(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetSkyboxModifier::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - disableSky = parent->GetRawData().at(rawDataIndex + 0x04); - disableSunMoon = parent->GetRawData().at(rawDataIndex + 0x05); -} - -std::string SetSkyboxModifier::GetBodySourceCode() const -{ - std::string sky = StringHelper::BoolStr(disableSky); - std::string soonMoon = StringHelper::BoolStr(disableSunMoon); - return StringHelper::Sprintf("SCENE_CMD_SKYBOX_DISABLES(%s, %s)", sky.c_str(), - soonMoon.c_str()); -} - -std::string SetSkyboxModifier::GetCommandCName() const -{ - return "SCmdSkyboxDisables"; -} - -RoomCommand SetSkyboxModifier::GetRoomCommand() const -{ - return RoomCommand::SetSkyboxModifier; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.h deleted file mode 100644 index 65935bf92..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxModifier.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetSkyboxModifier : public ZRoomCommand -{ -public: - uint8_t disableSky; - uint8_t disableSunMoon; - - SetSkyboxModifier(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp deleted file mode 100644 index d5ae7ef76..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include "SetSkyboxSettings.h" -#include "Globals.h" -#include "Utils/StringHelper.h" - -SetSkyboxSettings::SetSkyboxSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetSkyboxSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - unk1 = cmdArg1; - skyboxNumber = parent->GetRawData().at(rawDataIndex + 0x04); - cloudsType = parent->GetRawData().at(rawDataIndex + 0x05); - isIndoors = parent->GetRawData().at(rawDataIndex + 0x06); -} - -std::string SetSkyboxSettings::GetBodySourceCode() const -{ - std::string indoors = StringHelper::BoolStr(isIndoors); - if (Globals::Instance->game == ZGame::MM_RETAIL) - return StringHelper::Sprintf("SCENE_CMD_SKYBOX_SETTINGS(0x%02X, %i, %i, %s)", unk1, - skyboxNumber, cloudsType, indoors.c_str()); - return StringHelper::Sprintf("SCENE_CMD_SKYBOX_SETTINGS(%i, %i, %s)", skyboxNumber, cloudsType, - indoors.c_str()); -} - -std::string SetSkyboxSettings::GetCommandCName() const -{ - return "SCmdSkyboxSettings"; -} - -RoomCommand SetSkyboxSettings::GetRoomCommand() const -{ - return RoomCommand::SetSkyboxSettings; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.h deleted file mode 100644 index 1c7e01ad4..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSkyboxSettings.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetSkyboxSettings : public ZRoomCommand -{ -public: - uint8_t unk1; // (MM Only) - uint8_t skyboxNumber; - uint8_t cloudsType; - uint8_t isIndoors; - - SetSkyboxSettings(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.cpp deleted file mode 100644 index 54b91328f..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "SetSoundSettings.h" -#include "Utils/StringHelper.h" - -SetSoundSettings::SetSoundSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetSoundSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - reverb = cmdArg1; - nightTimeSFX = parent->GetRawData().at(rawDataIndex + 0x06); - musicSequence = parent->GetRawData().at(rawDataIndex + 0x07); -} - -std::string SetSoundSettings::GetBodySourceCode() const -{ - return StringHelper::Sprintf("SCENE_CMD_SOUND_SETTINGS(%i, %i, %i)", reverb, nightTimeSFX, - musicSequence); -} - -std::string SetSoundSettings::GetCommandCName() const -{ - return "SCmdSoundSettings"; -} - -RoomCommand SetSoundSettings::GetRoomCommand() const -{ - return RoomCommand::SetSoundSettings; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.h deleted file mode 100644 index f378e5e4e..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSoundSettings.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetSoundSettings : public ZRoomCommand -{ -public: - uint8_t reverb; - uint8_t nightTimeSFX; - uint8_t musicSequence; - - SetSoundSettings(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp deleted file mode 100644 index 696a3de01..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include "SetSpecialObjects.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZRoom/ZNames.h" - -SetSpecialObjects::SetSpecialObjects(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetSpecialObjects::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - elfMessage = cmdArg1; - globalObject = BitConverter::ToUInt16BE(parent->GetRawData(), rawDataIndex + 0x06); -} - -std::string SetSpecialObjects::GetBodySourceCode() const -{ - std::string objectName = ZNames::GetObjectName(globalObject); - - return StringHelper::Sprintf("SCENE_CMD_SPECIAL_FILES(0x%02X, %s)", elfMessage, - objectName.c_str()); -} - -std::string SetSpecialObjects::GetCommandCName() const -{ - return "SCmdSpecialFiles"; -} - -RoomCommand SetSpecialObjects::GetRoomCommand() const -{ - return RoomCommand::SetSpecialObjects; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.h deleted file mode 100644 index 3327d44c3..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetSpecialObjects.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetSpecialObjects : public ZRoomCommand -{ -public: - uint8_t elfMessage; - uint16_t globalObject; - - SetSpecialObjects(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.cpp deleted file mode 100644 index 03856d23b..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include "SetStartPositionList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZNames.h" -#include "ZRoom/ZRoom.h" - -SetStartPositionList::SetStartPositionList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetStartPositionList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - uint8_t numActors = cmdArg1; - - offset_t currentPtr = segmentOffset; - - actors.reserve(numActors); - for (uint32_t i = 0; i < numActors; i++) - { - actors.push_back(ActorSpawnEntry(parent->GetRawData(), currentPtr)); - currentPtr += 16; - } -} - -void SetStartPositionList::DeclareReferences(const std::string& prefix) -{ - if (!actors.empty()) - { - std::string declaration; - - size_t index = 0; - for (const auto& entry : actors) - { - declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); - if (index + 1 < actors.size()) - declaration += "\n"; - - index++; - } - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, actors.size() * 16, "ActorEntry", - StringHelper::Sprintf("%sStartPositionList0x%06X", prefix.c_str(), segmentOffset), - actors.size(), declaration); - } -} - -std::string SetStartPositionList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "ActorEntry", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_SPAWN_LIST(%i, %s)", actors.size(), listName.c_str()); -} - -std::string SetStartPositionList::GetCommandCName() const -{ - return "SCmdSpawnList"; -} - -RoomCommand SetStartPositionList::GetRoomCommand() const -{ - return RoomCommand::SetStartPositionList; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.h deleted file mode 100644 index 10075adf3..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetStartPositionList.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "SetActorList.h" -#include "ZRoom/ZRoomCommand.h" - -class SetStartPositionList : public ZRoomCommand -{ -public: - std::vector actors; - - SetStartPositionList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.cpp deleted file mode 100644 index 9d4d356df..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "SetTimeSettings.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -SetTimeSettings::SetTimeSettings(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetTimeSettings::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - hour = parent->GetRawData().at(rawDataIndex + 4); - min = parent->GetRawData().at(rawDataIndex + 5); - unk = parent->GetRawData().at(rawDataIndex + 6); -} - -std::string SetTimeSettings::GetBodySourceCode() const -{ - return StringHelper::Sprintf("SCENE_CMD_TIME_SETTINGS(%i, %i, %i)", hour, min, unk); -} - -std::string SetTimeSettings::GetCommandCName() const -{ - return "SCmdTimeSettings"; -} - -RoomCommand SetTimeSettings::GetRoomCommand() const -{ - return RoomCommand::SetTimeSettings; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.h deleted file mode 100644 index 7ff2711d4..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetTimeSettings.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetTimeSettings : public ZRoomCommand -{ -public: - uint8_t hour; - uint8_t min; - uint8_t unk; - - SetTimeSettings(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp deleted file mode 100644 index 051ddd875..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp +++ /dev/null @@ -1,93 +0,0 @@ -#include "SetTransitionActorList.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" -#include "ZRoom/ZNames.h" -#include "ZRoom/ZRoom.h" - -SetTransitionActorList::SetTransitionActorList(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetTransitionActorList::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - int numActors = cmdArg1; - uint32_t currentPtr = segmentOffset; - - transitionActors.reserve(numActors); - for (int32_t i = 0; i < numActors; i++) - { - TransitionActorEntry entry(parent->GetRawData(), currentPtr); - transitionActors.push_back(entry); - - currentPtr += 16; - } -} - -void SetTransitionActorList::DeclareReferences(const std::string& prefix) -{ - std::string declaration; - - size_t index = 0; - for (const auto& entry : transitionActors) - { - declaration += StringHelper::Sprintf(" { %s },", entry.GetBodySourceCode().c_str()); - if (index + 1 < transitionActors.size()) - { - declaration += "\n"; - } - - index++; - } - - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, transitionActors.size() * 16, - "TransitionActorEntry", - StringHelper::Sprintf("%sTransitionActorList_%06X", prefix.c_str(), segmentOffset), - transitionActors.size(), declaration); -} - -std::string SetTransitionActorList::GetBodySourceCode() const -{ - std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "TransitionActorEntry", listName, - parent->workerID); - return StringHelper::Sprintf("SCENE_CMD_TRANSITION_ACTOR_LIST(%i, %s)", transitionActors.size(), - listName.c_str()); -} - -std::string SetTransitionActorList::GetCommandCName() const -{ - return "SCmdTransiActorList"; -} - -RoomCommand SetTransitionActorList::GetRoomCommand() const -{ - return RoomCommand::SetTransitionActorList; -} - -TransitionActorEntry::TransitionActorEntry(const std::vector& rawData, int rawDataIndex) -{ - frontObjectRoom = rawData[rawDataIndex + 0]; - frontTransitionReaction = rawData[rawDataIndex + 1]; - backObjectRoom = rawData[rawDataIndex + 2]; - backTransitionReaction = rawData[rawDataIndex + 3]; - actorNum = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - posX = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - posY = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); - posZ = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); - rotY = BitConverter::ToInt16BE(rawData, rawDataIndex + 12); - initVar = BitConverter::ToInt16BE(rawData, rawDataIndex + 14); -} - -std::string TransitionActorEntry::GetBodySourceCode() const -{ - std::string actorStr = ZNames::GetActorName(actorNum); - - return StringHelper::Sprintf("%i, %i, %i, %i, %s, %i, %i, %i, %i, 0x%04X", frontObjectRoom, - frontTransitionReaction, backObjectRoom, backTransitionReaction, - actorStr.c_str(), posX, posY, posZ, rotY, initVar); -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.h deleted file mode 100644 index a5ce2e66f..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetTransitionActorList.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class TransitionActorEntry -{ -public: - uint8_t frontObjectRoom; - uint8_t frontTransitionReaction; - uint8_t backObjectRoom; - uint8_t backTransitionReaction; - uint16_t actorNum; - int16_t posX, posY, posZ; - int16_t rotY; - uint16_t initVar; - - TransitionActorEntry(const std::vector& rawData, int rawDataIndex); - - std::string GetBodySourceCode() const; -}; - -class SetTransitionActorList : public ZRoomCommand -{ -public: - std::vector transitionActors; - - SetTransitionActorList(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.cpp deleted file mode 100644 index 1893b5601..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "SetWind.h" -#include "Utils/StringHelper.h" - -SetWind::SetWind(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -void SetWind::ParseRawData() -{ - ZRoomCommand::ParseRawData(); - auto& parentRawData = parent->GetRawData(); - windWest = parentRawData.at(rawDataIndex + 0x04); - windVertical = parentRawData.at(rawDataIndex + 0x05); - windSouth = parentRawData.at(rawDataIndex + 0x06); - clothFlappingStrength = parentRawData.at(rawDataIndex + 0x07); -} - -std::string SetWind::GetBodySourceCode() const -{ - return StringHelper::Sprintf("SCENE_CMD_WIND_SETTINGS(%i, %i, %i, %i)", windWest, windVertical, - windSouth, clothFlappingStrength); -} - -std::string SetWind::GetCommandCName() const -{ - return "SCmdWindSettings"; -} - -RoomCommand SetWind::GetRoomCommand() const -{ - return RoomCommand::SetWind; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.h deleted file mode 100644 index 05eaafeda..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetWind.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetWind : public ZRoomCommand -{ -public: - uint8_t windWest; - uint8_t windVertical; - uint8_t windSouth; - uint8_t clothFlappingStrength; - - SetWind(ZFile* nParent); - - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - std::string GetCommandCName() const override; - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp deleted file mode 100644 index d20e4a3e2..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "SetWorldMapVisited.h" - -#include "Utils/StringHelper.h" - -SetWorldMapVisited::SetWorldMapVisited(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -std::string SetWorldMapVisited::GetBodySourceCode() const -{ - return "SCENE_CMD_MISC_SETTINGS()"; -} - -std::string SetWorldMapVisited::GetCommandCName() const -{ - return "SCmdWorldMapVisited"; -} - -RoomCommand SetWorldMapVisited::GetRoomCommand() const -{ - return RoomCommand::SetWorldMapVisited; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.h b/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.h deleted file mode 100644 index a7ad93154..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/SetWorldMapVisited.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class SetWorldMapVisited : public ZRoomCommand -{ -public: - SetWorldMapVisited(ZFile* nParent); - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.cpp deleted file mode 100644 index 9dfcaa5c2..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "Unused09.h" -#include "Utils/StringHelper.h" - -Unused09::Unused09(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -std::string Unused09::GetBodySourceCode() const -{ - return "SCENE_CMD_UNK_09()"; -} - -std::string Unused09::GetCommandCName() const -{ - return "SceneCmd"; -} - -RoomCommand Unused09::GetRoomCommand() const -{ - return RoomCommand::Unused09; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.h b/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.h deleted file mode 100644 index a38985eea..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/Unused09.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class Unused09 : public ZRoomCommand -{ -public: - Unused09(ZFile* nParent); - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.cpp deleted file mode 100644 index b8ea13652..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "Unused1D.h" -#include "Utils/StringHelper.h" - -Unused1D::Unused1D(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -std::string Unused1D::GetBodySourceCode() const -{ - return StringHelper::Sprintf("{ %s, 0x00, 0x00 }", GetCommandHex().c_str()); -} - -std::string Unused1D::GetCommandCName() const -{ - return "SceneCmd"; -} - -RoomCommand Unused1D::GetRoomCommand() const -{ - return RoomCommand::Unused1D; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.h b/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.h deleted file mode 100644 index dea0f98ee..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/Unused1D.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "ZRoom/ZRoomCommand.h" - -class Unused1D : public ZRoomCommand -{ -public: - Unused1D(ZFile* nParent); - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; - std::string GetCommandCName() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp b/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp deleted file mode 100644 index a892086c2..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "ZRoomCommandUnk.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZRoom/ZRoom.h" - -ZRoomCommandUnk::ZRoomCommandUnk(ZFile* nParent) : ZRoomCommand(nParent) -{ -} - -std::string ZRoomCommandUnk::GetBodySourceCode() const -{ - return StringHelper::Sprintf("{ %s, 0x%02X, 0x%06X } /* WARNING: " - "UNIMPLEMENTED ROOM COMMAND */", - GetCommandHex().c_str(), cmdArg1, cmdArg2); -} - -RoomCommand ZRoomCommandUnk::GetRoomCommand() const -{ - return RoomCommand::Error; -} diff --git a/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h b/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h deleted file mode 100644 index e381fe5a5..000000000 --- a/ZAPDTR/ZAPD/ZRoom/Commands/ZRoomCommandUnk.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include "ZRoom/ZRoomCommand.h" - -class ZRoomCommandUnk : public ZRoomCommand -{ -public: - ZRoomCommandUnk(ZFile* nParent); - - std::string GetBodySourceCode() const override; - - RoomCommand GetRoomCommand() const override; -}; diff --git a/ZAPDTR/ZAPD/ZRoom/ZNames.h b/ZAPDTR/ZAPD/ZRoom/ZNames.h deleted file mode 100644 index 667407c36..000000000 --- a/ZAPDTR/ZAPD/ZRoom/ZNames.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include - -#include "Globals.h" -#include "Utils/StringHelper.h" - -class ZNames -{ -public: - static std::string GetObjectName(size_t id) - { - if (id >= Globals::Instance->cfg.objectList.size()) - return StringHelper::Sprintf("0x%04X", id); - return Globals::Instance->cfg.objectList[id]; - } - - static std::string GetActorName(uint16_t id) - { - switch (Globals::Instance->game) - { - case ZGame::OOT_RETAIL: - case ZGame::OOT_SW97: - if (id < ZNames::GetNumActors()) - return Globals::Instance->cfg.actorList[id]; - else - return StringHelper::Sprintf("0x%04X", id); - case ZGame::MM_RETAIL: - { - int32_t flags = id & 0xF000; - id &= 0xFFF; - std::string name; - if (id < ZNames::GetNumActors()) - name = Globals::Instance->cfg.actorList[id]; - else - name = StringHelper::Sprintf("0x%04X", id); - - if (flags == 0) - return name; - else - return StringHelper::Sprintf("%s | 0x%04X", name.c_str(), flags); - } - } - - return ""; - } - - static std::string GetEntranceName(uint16_t id) - { - if (ZNames::GetNumEntrances() == 0 || ZNames::GetNumSpecialEntrances() == 0) - return StringHelper::Sprintf("0x%04X", id); - - if (id < ZNames::GetNumEntrances()) - return Globals::Instance->cfg.entranceList[id]; - else if ((id >= 0x7FF9 && id <= 0x7FFF) && !((id - 0x7FF9U) > GetNumSpecialEntrances())) // Special entrances - return Globals::Instance->cfg.specialEntranceList[id - 0x7FF9]; - else - return StringHelper::Sprintf("0x%04X", id); - } - - static size_t GetNumActors() { return Globals::Instance->cfg.actorList.size(); } - static size_t GetNumEntrances() { return Globals::Instance->cfg.entranceList.size(); } - static size_t GetNumSpecialEntrances() { return Globals::Instance->cfg.specialEntranceList.size(); } -}; diff --git a/ZAPDTR/ZAPD/ZRoom/ZRoom.cpp b/ZAPDTR/ZAPD/ZRoom/ZRoom.cpp deleted file mode 100644 index 11dd70687..000000000 --- a/ZAPDTR/ZAPD/ZRoom/ZRoom.cpp +++ /dev/null @@ -1,427 +0,0 @@ -#include "ZRoom.h" -#include -#include -#include -#include -#include - -#include "Commands/EndMarker.h" -#include "Commands/SetActorCutsceneList.h" -#include "Commands/SetActorList.h" -#include "Commands/SetAlternateHeaders.h" -#include "Commands/SetAnimatedMaterialList.h" -#include "Commands/SetCameraSettings.h" -#include "Commands/SetCollisionHeader.h" -#include "Commands/SetCsCamera.h" -#include "Commands/SetCutscenes.h" -#include "Commands/SetEchoSettings.h" -#include "Commands/SetEntranceList.h" -#include "Commands/SetExitList.h" -#include "Commands/SetLightList.h" -#include "Commands/SetLightingSettings.h" -#include "Commands/SetMesh.h" -#include "Commands/SetMinimapChests.h" -#include "Commands/SetMinimapList.h" -#include "Commands/SetObjectList.h" -#include "Commands/SetPathways.h" -#include "Commands/SetRoomBehavior.h" -#include "Commands/SetRoomList.h" -#include "Commands/SetSkyboxModifier.h" -#include "Commands/SetSkyboxSettings.h" -#include "Commands/SetSoundSettings.h" -#include "Commands/SetSpecialObjects.h" -#include "Commands/SetStartPositionList.h" -#include "Commands/SetTimeSettings.h" -#include "Commands/SetTransitionActorList.h" -#include "Commands/SetWind.h" -#include "Commands/SetWorldMapVisited.h" -#include "Commands/Unused09.h" -#include "Commands/Unused1D.h" -#include "Commands/ZRoomCommandUnk.h" -#include "Globals.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZBlob.h" -#include "ZCutscene.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Room, ZRoom); -REGISTER_ZFILENODE(Scene, ZRoom); -REGISTER_ZFILENODE(AltHeader, ZRoom); - -ZRoom::ZRoom(ZFile* nParent) : ZResource(nParent) -{ - roomCount = -1; - canHaveInner = true; - RegisterOptionalAttribute("HackMode"); -} - -ZRoom::~ZRoom() -{ - for (ZRoomCommand* cmd : commands) - delete cmd; -} - -void ZRoom::ExtractFromXML(tinyxml2::XMLElement* reader, uint32_t nRawDataIndex) -{ - ZResource::ExtractFromXML(reader, nRawDataIndex); - - if (hackMode == "syotes_room") - { - SyotesRoomHack(); - } - else - { - DeclareVar(name, ""); - } -} - -void ZRoom::ExtractFromBinary(uint32_t nRawDataIndex, ZResourceType parentType) -{ - rawDataIndex = nRawDataIndex; - name = GetDefaultName(parent->GetName()); - - zroomType = ZResourceType::AltHeader; - switch (parentType) - { - case ZResourceType::Scene: - case ZResourceType::Room: - case ZResourceType::AltHeader: - parentZroomType = parentType; - break; - - default: - // TODO: error message or something - assert(false); - break; - } - - ParseRawData(); - DeclareVar(name, ""); -} - -void ZRoom::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - // TODO: HACK: remove this specific check when the repo uses the correct HackMode="syotes_room" - if (name == "syotes_room_0") - { - hackMode = "syotes_room"; - } - - std::string nodeName = std::string(reader->Name()); - if (nodeName == "Scene") - { - zroomType = ZResourceType::Scene; - } - else if (nodeName == "Room") - zroomType = ZResourceType::Room; - else if (nodeName == "AltHeader") - zroomType = ZResourceType::AltHeader; - - if (reader->Attribute("HackMode") != nullptr) - { - hackMode = std::string(reader->Attribute("HackMode")); - if (hackMode != "syotes_room") - { - std::string headerError = StringHelper::Sprintf( - "invalid value found for 'HackMode' attribute: '%s'", hackMode.c_str()); - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - headerError, ""); - } - } -} - -void ZRoom::ParseRawData() -{ - if (hackMode == "syotes_room") - return; - - bool shouldContinue = true; - uint32_t currentIndex = 0; - uint32_t currentPtr = rawDataIndex; - - const auto& rawData = parent->GetRawData(); - while (shouldContinue) - { - RoomCommand opcode = static_cast(rawData.at(currentPtr)); - - ZRoomCommand* cmd = nullptr; - - auto start = std::chrono::steady_clock::now(); - - switch (opcode) - { - case RoomCommand::SetStartPositionList: - cmd = new SetStartPositionList(parent); - break; // 0x00 - case RoomCommand::SetActorList: - cmd = new SetActorList(parent); - break; // 0x01 - case RoomCommand::SetCsCamera: - cmd = new SetCsCamera(parent); - break; // 0x02 (MM-ONLY) - case RoomCommand::SetCollisionHeader: - cmd = new SetCollisionHeader(parent); - break; // 0x03 - case RoomCommand::SetRoomList: - cmd = new SetRoomList(parent); - break; // 0x04 - case RoomCommand::SetWind: - cmd = new SetWind(parent); - break; // 0x05 - case RoomCommand::SetEntranceList: - cmd = new SetEntranceList(parent); - break; // 0x06 - case RoomCommand::SetSpecialObjects: - cmd = new SetSpecialObjects(parent); - break; // 0x07 - case RoomCommand::SetRoomBehavior: - cmd = new SetRoomBehavior(parent); - break; // 0x08 - case RoomCommand::Unused09: - cmd = new Unused09(parent); - break; // 0x09 - case RoomCommand::SetMesh: - cmd = new SetMesh(parent); - break; // 0x0A - case RoomCommand::SetObjectList: - cmd = new SetObjectList(parent); - break; // 0x0B - case RoomCommand::SetLightList: - cmd = new SetLightList(parent); - break; // 0x0C (MM-ONLY) - case RoomCommand::SetPathways: - cmd = new SetPathways(parent); - break; // 0x0D - case RoomCommand::SetTransitionActorList: - cmd = new SetTransitionActorList(parent); - break; // 0x0E - case RoomCommand::SetLightingSettings: - cmd = new SetLightingSettings(parent); - break; // 0x0F - case RoomCommand::SetTimeSettings: - cmd = new SetTimeSettings(parent); - break; // 0x10 - case RoomCommand::SetSkyboxSettings: - cmd = new SetSkyboxSettings(parent); - break; // 0x11 - case RoomCommand::SetSkyboxModifier: - cmd = new SetSkyboxModifier(parent); - break; // 0x12 - case RoomCommand::SetExitList: - cmd = new SetExitList(parent); - break; // 0x13 - case RoomCommand::EndMarker: - cmd = new EndMarker(parent); - break; // 0x14 - case RoomCommand::SetSoundSettings: - cmd = new SetSoundSettings(parent); - break; // 0x15 - case RoomCommand::SetEchoSettings: - cmd = new SetEchoSettings(parent); - break; // 0x16 - case RoomCommand::SetCutscenes: - cmd = new SetCutscenes(parent); - break; // 0x17 - case RoomCommand::SetAlternateHeaders: - cmd = new SetAlternateHeaders(parent); - break; // 0x18 - case RoomCommand::SetCameraSettings: - if (Globals::Instance->game == ZGame::MM_RETAIL) - cmd = new SetWorldMapVisited(parent); - else - cmd = new SetCameraSettings(parent); - break; // 0x19 - case RoomCommand::SetAnimatedMaterialList: - cmd = new SetAnimatedMaterialList(parent); - break; // 0x1A (MM-ONLY) - case RoomCommand::SetActorCutsceneList: - cmd = new SetActorCutsceneList(parent); - break; // 0x1B (MM-ONLY) - case RoomCommand::SetMinimapList: - cmd = new SetMinimapList(parent); - break; // 0x1C (MM-ONLY) - case RoomCommand::Unused1D: - cmd = new Unused1D(parent); - break; // 0x1D - case RoomCommand::SetMinimapChests: - cmd = new SetMinimapChests(parent); - break; // 0x1E (MM-ONLY) - default: - cmd = new ZRoomCommandUnk(parent); - } - - cmd->commandSet = rawDataIndex; - cmd->ExtractCommandFromRoom(this, currentPtr); - - if (Globals::Instance->profile) - { - auto end = std::chrono::steady_clock::now(); - int64_t diff = - std::chrono::duration_cast(end - start).count(); - if (diff > 50) - printf("OP: %s, TIME: %" PRIi64 "ms\n", cmd->GetCommandCName().c_str(), diff); - } - - cmd->cmdIndex = currentIndex; - - commands.push_back(cmd); - - if (opcode == RoomCommand::EndMarker) - shouldContinue = false; - - currentPtr += 8; - currentIndex++; - } -} - -void ZRoom::DeclareReferences(const std::string& prefix) -{ - for (auto& cmd : commands) - cmd->DeclareReferences(prefix); -} - -void ZRoom::ParseRawDataLate() -{ - for (auto& cmd : commands) - cmd->ParseRawDataLate(); -} - -void ZRoom::DeclareReferencesLate(const std::string& prefix) -{ - for (auto& cmd : commands) - cmd->DeclareReferencesLate(prefix); -} - -Declaration* ZRoom::DeclareVar(const std::string& prefix, const std::string& body) -{ - std::string auxName = name; - if (auxName == "") - auxName = GetDefaultName(prefix); - if (zroomType == ZResourceType::Scene || zroomType == ZResourceType::Room) - auxName = StringHelper::Sprintf("%sCommands", name.c_str()); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, commands.size(), body); - decl->staticConf = staticConf; - return decl; -} - -std::string ZRoom::GetBodySourceCode() const -{ - std::string declaration; - - for (size_t i = 0; i < commands.size(); i++) - { - ZRoomCommand* cmd = commands[i]; - declaration += StringHelper::Sprintf("\t%s,", cmd->GetBodySourceCode().c_str()); - - if (i + 1 < commands.size()) - declaration += "\n"; - } - - return declaration; -} - -std::string ZRoom::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sSet_%06X", prefix.c_str(), rawDataIndex); -} - -/* - * There is one room in Ocarina of Time that lacks a header. Room 120, "Syotes", dates - * back to very early in the game's development. Since this room is a special case, - * declare automatically the data its contains whitout the need of a header. - */ -void ZRoom::SyotesRoomHack() -{ - PolygonType2 poly(parent, 0, this); - - poly.ParseRawData(); - poly.DeclareReferences(GetName()); - parent->AddDeclaration(0, poly.GetDeclarationAlignment(), poly.GetRawDataSize(), - poly.GetSourceTypeName(), poly.GetDefaultName(GetName()), - poly.GetBodySourceCode()); -} - -ZRoomCommand* ZRoom::FindCommandOfType(RoomCommand cmdType) -{ - for (size_t i = 0; i < commands.size(); i++) - { - if (commands[i]->GetRoomCommand() == cmdType) - return commands[i]; - } - - return nullptr; -} - -size_t ZRoom::GetDeclarationSizeFromNeighbor(uint32_t declarationAddress) -{ - auto currentDecl = parent->declarations.find(declarationAddress); - if (currentDecl == parent->declarations.end()) - return 0; - - auto nextDecl = currentDecl; - std::advance(nextDecl, 1); - if (nextDecl == parent->declarations.end()) - return parent->GetRawData().size() - currentDecl->first; - - return nextDecl->first - currentDecl->first; -} - -size_t ZRoom::GetCommandSizeFromNeighbor(ZRoomCommand* cmd) -{ - int32_t cmdIndex = -1; - - for (size_t i = 0; i < commands.size(); i++) - { - if (commands[i] == cmd) - { - cmdIndex = i; - break; - } - } - - if (cmdIndex != -1) - { - if (cmdIndex + 1 < (int32_t)commands.size()) - return commands[cmdIndex + 1]->cmdAddress - commands[cmdIndex]->cmdAddress; - else - return parent->GetRawData().size() - commands[cmdIndex]->cmdAddress; - } - - return 0; -} - -void ZRoom::GetSourceOutputCode([[maybe_unused]] const std::string& prefix) -{ - if (hackMode != "syotes_room") - DeclareVar(prefix, GetBodySourceCode()); -} - -size_t ZRoom::GetRawDataSize() const -{ - size_t size = 0; - - for (ZRoomCommand* cmd : commands) - size += cmd->GetRawDataSize(); - - return size; -} - -std::string ZRoom::GetSourceTypeName() const -{ - return "SceneCmd"; -} - -ZResourceType ZRoom::GetResourceType() const -{ - assert(zroomType == ZResourceType::Scene || zroomType == ZResourceType::Room || - zroomType == ZResourceType::AltHeader); - return zroomType; -} diff --git a/ZAPDTR/ZAPD/ZRoom/ZRoom.h b/ZAPDTR/ZAPD/ZRoom/ZRoom.h deleted file mode 100644 index e837ec70a..000000000 --- a/ZAPDTR/ZAPD/ZRoom/ZRoom.h +++ /dev/null @@ -1,50 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "ZResource.h" -#include "ZRoomCommand.h" -#include "tinyxml2.h" - -class ZRoom : public ZResource -{ -public: - std::vector commands; - int32_t roomCount; // Only valid for scenes - - std::string hackMode; - - ZResourceType zroomType = ZResourceType::Error; - ZResourceType parentZroomType = ZResourceType::Error; - - ZRoom(ZFile* nParent); - virtual ~ZRoom(); - - void ExtractFromXML(tinyxml2::XMLElement* reader, uint32_t nRawDataIndex) override; - void ExtractFromBinary(uint32_t nRawDataIndex, ZResourceType parentType); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - void ParseRawDataLate() override; - void DeclareReferencesLate(const std::string& prefix) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& body) override; - std::string GetBodySourceCode() const override; - - void GetSourceOutputCode(const std::string& prefix) override; - - std::string GetDefaultName(const std::string& prefix) const override; - size_t GetDeclarationSizeFromNeighbor(uint32_t declarationAddress); - size_t GetCommandSizeFromNeighbor(ZRoomCommand* cmd); - ZRoomCommand* FindCommandOfType(RoomCommand cmdType); - - size_t GetRawDataSize() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - -protected: - void SyotesRoomHack(); -}; diff --git a/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.cpp b/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.cpp deleted file mode 100644 index 711c86a40..000000000 --- a/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.cpp +++ /dev/null @@ -1,58 +0,0 @@ -#include "ZRoomCommand.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZRoom.h" - -ZRoomCommand::ZRoomCommand(ZFile* nParent) : ZResource(nParent) -{ -} - -void ZRoomCommand::ExtractCommandFromRoom(ZRoom* nZRoom, uint32_t nRawDataIndex) -{ - zRoom = nZRoom; - rawDataIndex = nRawDataIndex; - - ParseRawData(); -} - -void ZRoomCommand::ParseRawData() -{ - auto& parentRawData = parent->GetRawData(); - cmdID = static_cast(parentRawData.at(rawDataIndex)); - cmdAddress = rawDataIndex; - - cmdArg1 = parentRawData.at(rawDataIndex + 1); - cmdArg2 = BitConverter::ToUInt32BE(parentRawData, rawDataIndex + 4); - segmentOffset = Seg2Filespace(cmdArg2, parent->baseAddress); -} - -RoomCommand ZRoomCommand::GetRoomCommand() const -{ - return RoomCommand::Error; -} - -size_t ZRoomCommand::GetRawDataSize() const -{ - return 0x08; -} - -std::string ZRoomCommand::GetSourceTypeName() const -{ - return GetCommandCName(); -} - -ZResourceType ZRoomCommand::GetResourceType() const -{ - return ZResourceType::RoomCommand; -} - -std::string ZRoomCommand::GetCommandCName() const -{ - return "SceneCmd"; -} - -std::string ZRoomCommand::GetCommandHex() const -{ - return StringHelper::Sprintf("0x%02X", static_cast(cmdID)); -} diff --git a/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.h b/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.h deleted file mode 100644 index 5e4d0bc54..000000000 --- a/ZAPDTR/ZAPD/ZRoom/ZRoomCommand.h +++ /dev/null @@ -1,84 +0,0 @@ -#pragma once - -#include "tinyxml2.h" - -#include -#include - -#include "ZFile.h" -#include "ZResource.h" - -class ZRoom; - -enum class RoomCommand : uint8_t -{ - SetStartPositionList = 0x00, - SetActorList = 0x01, - SetCsCamera = 0x02, - SetCollisionHeader = 0x03, - SetRoomList = 0x04, - SetWind = 0x05, - SetEntranceList = 0x06, - SetSpecialObjects = 0x07, - SetRoomBehavior = 0x08, - Unused09 = 0x09, - SetMesh = 0x0A, - SetObjectList = 0x0B, - SetLightList = 0x0C, - SetPathways = 0x0D, - SetTransitionActorList = 0x0E, - SetLightingSettings = 0x0F, - SetTimeSettings = 0x10, - SetSkyboxSettings = 0x11, - SetSkyboxModifier = 0x12, - SetExitList = 0x13, - EndMarker = 0x14, - SetSoundSettings = 0x15, - SetEchoSettings = 0x16, - SetCutscenes = 0x17, - SetAlternateHeaders = 0x18, - SetCameraSettings = 0x19, - - // MM Commands - SetWorldMapVisited = 0x19, - SetAnimatedMaterialList = 0x1A, - SetActorCutsceneList = 0x1B, - SetMinimapList = 0x1C, - Unused1D = 0x1D, - SetMinimapChests = 0x1E, - - Error = 0xFF -}; - -class ZRoomCommand : public ZResource -{ -public: - int32_t cmdAddress; - uint32_t cmdIndex; - uint32_t commandSet; - RoomCommand cmdID; - offset_t segmentOffset; - - ZRoomCommand(ZFile* nParent); - virtual ~ZRoomCommand() = default; - - virtual void ExtractCommandFromRoom(ZRoom* nZRoom, uint32_t nRawDataIndex); - - void ParseRawData() override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - // Getters/Setters - virtual RoomCommand GetRoomCommand() const = 0; - size_t GetRawDataSize() const final override; - virtual std::string GetCommandCName() const; - - virtual std::string GetCommandHex() const; - -public: - ZRoom* zRoom; - - uint8_t cmdArg1; - segptr_t cmdArg2; -}; diff --git a/ZAPDTR/ZAPD/ZScalar.cpp b/ZAPDTR/ZAPD/ZScalar.cpp deleted file mode 100644 index 6c4cf121a..000000000 --- a/ZAPDTR/ZAPD/ZScalar.cpp +++ /dev/null @@ -1,280 +0,0 @@ -#include "ZScalar.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Scalar, ZScalar); - -ZScalar::ZScalar(ZFile* nParent) : ZResource(nParent) -{ - memset(&scalarData, 0, sizeof(ZScalarData)); - scalarType = ZScalarType::ZSCALAR_NONE; - RegisterRequiredAttribute("Type"); -} - -void ZScalar::ExtractFromBinary(uint32_t nRawDataIndex, ZScalarType nScalarType) -{ - rawDataIndex = nRawDataIndex; - scalarType = nScalarType; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); -} - -void ZScalar::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - scalarType = ZScalar::MapOutputTypeToScalarType(registeredAttributes.at("Type").value); -} - -ZScalarType ZScalar::MapOutputTypeToScalarType(const std::string& type) -{ - if (type == "s8") - { - return ZScalarType::ZSCALAR_S8; - } - else if (type == "u8") - { - return ZScalarType::ZSCALAR_U8; - } - else if (type == "x8") - { - return ZScalarType::ZSCALAR_X8; - } - else if (type == "s16") - { - return ZScalarType::ZSCALAR_S16; - } - else if (type == "u16") - { - return ZScalarType::ZSCALAR_U16; - } - else if (type == "x16") - { - return ZScalarType::ZSCALAR_X16; - } - else if (type == "s32") - { - return ZScalarType::ZSCALAR_S32; - } - else if (type == "u32") - { - return ZScalarType::ZSCALAR_U32; - } - else if (type == "x32") - { - return ZScalarType::ZSCALAR_X32; - } - else if (type == "s64") - { - return ZScalarType::ZSCALAR_S64; - } - else if (type == "u64") - { - return ZScalarType::ZSCALAR_U64; - } - else if (type == "x64") - { - return ZScalarType::ZSCALAR_X64; - } - else if (type == "f32") - { - return ZScalarType::ZSCALAR_F32; - } - else if (type == "f64") - { - return ZScalarType::ZSCALAR_F64; - } - - return ZScalarType::ZSCALAR_NONE; -} - -std::string ZScalar::MapScalarTypeToOutputType(const ZScalarType scalarType) -{ - switch (scalarType) - { - case ZScalarType::ZSCALAR_S8: - return "s8"; - case ZScalarType::ZSCALAR_U8: - case ZScalarType::ZSCALAR_X8: - return "u8"; - case ZScalarType::ZSCALAR_S16: - return "s16"; - case ZScalarType::ZSCALAR_U16: - case ZScalarType::ZSCALAR_X16: - return "u16"; - case ZScalarType::ZSCALAR_S32: - return "s32"; - case ZScalarType::ZSCALAR_U32: - case ZScalarType::ZSCALAR_X32: - return "u32"; - case ZScalarType::ZSCALAR_S64: - return "s64"; - case ZScalarType::ZSCALAR_U64: - case ZScalarType::ZSCALAR_X64: - return "u64"; - case ZScalarType::ZSCALAR_F32: - return "f32"; - case ZScalarType::ZSCALAR_F64: - return "f64"; - default: - return ""; - } -} - -size_t ZScalar::MapTypeToSize(const ZScalarType scalarType) -{ - switch (scalarType) - { - case ZScalarType::ZSCALAR_S8: - return sizeof(scalarData.s8); - case ZScalarType::ZSCALAR_U8: - case ZScalarType::ZSCALAR_X8: - return sizeof(scalarData.u8); - case ZScalarType::ZSCALAR_S16: - return sizeof(scalarData.s16); - case ZScalarType::ZSCALAR_U16: - case ZScalarType::ZSCALAR_X16: - return sizeof(scalarData.u16); - case ZScalarType::ZSCALAR_S32: - return sizeof(scalarData.s32); - case ZScalarType::ZSCALAR_U32: - case ZScalarType::ZSCALAR_X32: - return sizeof(scalarData.u32); - case ZScalarType::ZSCALAR_S64: - return sizeof(scalarData.s64); - case ZScalarType::ZSCALAR_U64: - case ZScalarType::ZSCALAR_X64: - return sizeof(scalarData.u64); - case ZScalarType::ZSCALAR_F32: - return sizeof(scalarData.f32); - case ZScalarType::ZSCALAR_F64: - return sizeof(scalarData.f64); - default: - return 0; - } -} - -size_t ZScalar::GetRawDataSize() const -{ - return ZScalar::MapTypeToSize(scalarType); -} - -void ZScalar::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - switch (scalarType) - { - case ZScalarType::ZSCALAR_S8: - scalarData.s8 = BitConverter::ToInt8BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_U8: - case ZScalarType::ZSCALAR_X8: - scalarData.u8 = BitConverter::ToUInt8BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_S16: - scalarData.s16 = BitConverter::ToInt16BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_U16: - case ZScalarType::ZSCALAR_X16: - scalarData.u16 = BitConverter::ToUInt16BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_S32: - scalarData.s32 = BitConverter::ToInt32BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_U32: - case ZScalarType::ZSCALAR_X32: - scalarData.u32 = BitConverter::ToUInt32BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_S64: - scalarData.s64 = BitConverter::ToInt64BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_U64: - case ZScalarType::ZSCALAR_X64: - scalarData.u64 = BitConverter::ToUInt64BE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_F32: - scalarData.f32 = BitConverter::ToFloatBE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_F64: - scalarData.f64 = BitConverter::ToDoubleBE(rawData, rawDataIndex); - break; - case ZScalarType::ZSCALAR_NONE: - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'Type' attribute", "Defaulting to ''"); - break; - } -} - -std::string ZScalar::GetSourceTypeName() const -{ - return ZScalar::MapScalarTypeToOutputType(scalarType); -} - -std::string ZScalar::GetBodySourceCode() const -{ - switch (scalarType) - { - case ZScalarType::ZSCALAR_S8: - return StringHelper::Sprintf("%hhd", scalarData.s8); - case ZScalarType::ZSCALAR_U8: - return StringHelper::Sprintf("%hhu", scalarData.u8); - case ZScalarType::ZSCALAR_X8: - return StringHelper::Sprintf("0x%02X", scalarData.u8); - case ZScalarType::ZSCALAR_S16: - return StringHelper::Sprintf("%hd", scalarData.s16); - case ZScalarType::ZSCALAR_U16: - return StringHelper::Sprintf("%hu", scalarData.u16); - case ZScalarType::ZSCALAR_X16: - return StringHelper::Sprintf("0x%04X", scalarData.u16); - case ZScalarType::ZSCALAR_S32: - return StringHelper::Sprintf("%d", scalarData.s32); - case ZScalarType::ZSCALAR_U32: - return StringHelper::Sprintf("%u", scalarData.u32); - case ZScalarType::ZSCALAR_X32: - return StringHelper::Sprintf("0x%08X", scalarData.u32); - case ZScalarType::ZSCALAR_S64: - return StringHelper::Sprintf("%lld", scalarData.s64); - case ZScalarType::ZSCALAR_U64: - return StringHelper::Sprintf("%llu", scalarData.u64); - case ZScalarType::ZSCALAR_X64: - return StringHelper::Sprintf("0x%016X", scalarData.u64); - case ZScalarType::ZSCALAR_F32: - return StringHelper::Sprintf("%f", scalarData.f32); - case ZScalarType::ZSCALAR_F64: - return StringHelper::Sprintf("%lf", scalarData.f64); - default: - return "SCALAR_ERROR"; - } -} - -ZResourceType ZScalar::GetResourceType() const -{ - return ZResourceType::Scalar; -} - -bool ZScalar::DoesSupportArray() const -{ - return true; -} - -DeclarationAlignment ZScalar::GetDeclarationAlignment() const -{ - switch (scalarType) - { - case ZScalarType::ZSCALAR_S64: - case ZScalarType::ZSCALAR_U64: - case ZScalarType::ZSCALAR_F64: - return DeclarationAlignment::Align8; - default: - return DeclarationAlignment::Align4; - } -} diff --git a/ZAPDTR/ZAPD/ZScalar.h b/ZAPDTR/ZAPD/ZScalar.h deleted file mode 100644 index 8f98f261d..000000000 --- a/ZAPDTR/ZAPD/ZScalar.h +++ /dev/null @@ -1,68 +0,0 @@ -#pragma once - -#include -#include -#include -#include "ZResource.h" -#include "tinyxml2.h" - -enum class ZScalarType -{ - ZSCALAR_NONE, - ZSCALAR_S8, - ZSCALAR_U8, - ZSCALAR_X8, - ZSCALAR_S16, - ZSCALAR_U16, - ZSCALAR_X16, - ZSCALAR_S32, - ZSCALAR_U32, - ZSCALAR_X32, - ZSCALAR_S64, - ZSCALAR_U64, - ZSCALAR_X64, - ZSCALAR_F32, - ZSCALAR_F64 -}; - -typedef union ZScalarData -{ - uint8_t u8; - int8_t s8; - uint16_t u16; - int16_t s16; - uint32_t u32; - int32_t s32; - uint64_t u64; - int64_t s64; - float f32; - double f64; -} ZScalarData; - -class ZScalar : public ZResource -{ - friend class ZVector; - -public: - ZScalarData scalarData; - ZScalarType scalarType; - - ZScalar(ZFile* nParent); - - void ExtractFromBinary(uint32_t nRawDataIndex, ZScalarType nScalarType); - - void ParseRawData() override; - void ParseXML(tinyxml2::XMLElement* reader) override; - std::string GetBodySourceCode() const override; - - bool DoesSupportArray() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - - static size_t MapTypeToSize(const ZScalarType scalarType); - static ZScalarType MapOutputTypeToScalarType(const std::string& type); - static std::string MapScalarTypeToOutputType(const ZScalarType scalarType); -}; diff --git a/ZAPDTR/ZAPD/ZSkeleton.cpp b/ZAPDTR/ZAPD/ZSkeleton.cpp deleted file mode 100644 index a071209bc..000000000 --- a/ZAPDTR/ZAPD/ZSkeleton.cpp +++ /dev/null @@ -1,478 +0,0 @@ -#include "ZSkeleton.h" - -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "WarningHandler.h" - -REGISTER_ZFILENODE(Skeleton, ZSkeleton); -REGISTER_ZFILENODE(LimbTable, ZLimbTable); - -ZSkeleton::ZSkeleton(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("Type"); - RegisterRequiredAttribute("LimbType"); - genOTRDef = true; - - RegisterOptionalAttribute("EnumName"); - RegisterOptionalAttribute("LimbNone"); - RegisterOptionalAttribute("LimbMax"); - - genOTRDef = true; -} - -void ZSkeleton::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - std::string skelTypeXml = registeredAttributes.at("Type").value; - - if (skelTypeXml == "Flex") - type = ZSkeletonType::Flex; - else if (skelTypeXml == "Curve") - type = ZSkeletonType::Curve; - else if (skelTypeXml != "Normal") - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'Type' attribute", ""); - } - - std::string limbTypeXml = registeredAttributes.at("LimbType").value; - limbType = ZLimb::GetTypeByAttributeName(limbTypeXml); - if (limbType == ZLimbType::Invalid) - { - HANDLE_ERROR_RESOURCE( - WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("invalid value '%s' found for 'LimbType' attribute", - limbTypeXml.c_str()), - "Defaulting to 'Standard'."); - } - - enumName = registeredAttributes.at("EnumName").value; - limbNoneName = registeredAttributes.at("LimbNone").value; - limbMaxName = registeredAttributes.at("LimbMax").value; - - if (enumName != "") - { - if (limbNoneName == "" || limbMaxName == "") - { - HANDLE_ERROR_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - "'EnumName' attribute was used but either 'LimbNone' or " - "'LimbMax' attribute is missing", - ""); - } - } - - if (limbNoneName != "") - { - if (limbMaxName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "'LimbNone' attribute was used but 'LimbMax' attribute is missing", ""); - } - } - - if (limbMaxName != "") - { - if (limbNoneName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "'LimbMax' attribute was used but 'LimbNone' attribute is missing", ""); - } - } -} - -void ZSkeleton::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - limbsArrayAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex); - limbCount = BitConverter::ToUInt8BE(rawData, rawDataIndex + 4); - - if (type == ZSkeletonType::Flex) - { - dListCount = BitConverter::ToUInt8BE(rawData, rawDataIndex + 8); - } -} - -void ZSkeleton::DeclareReferences(const std::string& prefix) -{ - std::string defaultPrefix = name; - if (defaultPrefix == "") - defaultPrefix = prefix; - - ZResource::DeclareReferences(defaultPrefix); - - if (limbsArrayAddress != SEGMENTED_NULL && GETSEGNUM(limbsArrayAddress) == parent->segment) - { - offset_t ptr = Seg2Filespace(limbsArrayAddress, parent->baseAddress); - - if (!parent->HasDeclaration(ptr)) - { - limbsTable = new ZLimbTable(parent); - limbsTable->ExtractFromBinary(ptr, limbType, limbCount); - limbsTable->SetName(StringHelper::Sprintf("%sLimbs", defaultPrefix.c_str())); - parent->AddResource(limbsTable); - } - else - { - limbsTable = static_cast(parent->FindResource(ptr)); - } - - if (limbsTable->enumName == "") - { - limbsTable->enumName = enumName; - } - if (limbsTable->limbNoneName == "") - { - limbsTable->limbNoneName = limbNoneName; - } - if (limbsTable->limbMaxName == "") - { - limbsTable->limbMaxName = limbMaxName; - } - } -} - -std::string ZSkeleton::GetBodySourceCode() const -{ - std::string limbArrayName; - Globals::Instance->GetSegmentedPtrName(limbsArrayAddress, parent, "", limbArrayName, - parent->workerID); - - std::string countStr; - assert(limbsTable != nullptr); - // There are some Skeletons with the wrong limb count on them, so this check is necessary. - if (limbsTable->count == limbCount) - { - countStr = StringHelper::Sprintf("ARRAY_COUNT(%s)", limbArrayName.c_str()); - } - else - { - countStr = StringHelper::Sprintf("%i", limbCount); - } - - switch (type) - { - case ZSkeletonType::Normal: - case ZSkeletonType::Curve: - return StringHelper::Sprintf("\n\t%s, %s\n", limbArrayName.c_str(), countStr.c_str()); - - case ZSkeletonType::Flex: - return StringHelper::Sprintf("\n\t{ %s, %s }, %i\n", limbArrayName.c_str(), - countStr.c_str(), dListCount); - } - - // TODO: Throw exception? - return "ERROR"; -} - -size_t ZSkeleton::GetRawDataSize() const -{ - switch (type) - { - case ZSkeletonType::Flex: - return 0xC; - case ZSkeletonType::Normal: - case ZSkeletonType::Curve: - default: - return 0x8; - } -} - -std::string ZSkeleton::GetSourceTypeName() const -{ - switch (type) - { - case ZSkeletonType::Normal: - return "SkeletonHeader"; - case ZSkeletonType::Flex: - return "FlexSkeletonHeader"; - case ZSkeletonType::Curve: - return "SkelCurveLimbList"; - } - - return "SkeletonHeader"; -} - -ZResourceType ZSkeleton::GetResourceType() const -{ - return ZResourceType::Skeleton; -} - -DeclarationAlignment ZSkeleton::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align4; -} - -uint8_t ZSkeleton::GetLimbCount() -{ - return limbCount; -} - -/* ZLimbTable */ - -ZLimbTable::ZLimbTable(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("LimbType"); - RegisterRequiredAttribute("Count"); - RegisterOptionalAttribute("EnumName"); - RegisterOptionalAttribute("LimbNone"); - RegisterOptionalAttribute("LimbMax"); -} - -void ZLimbTable::ExtractFromBinary(uint32_t nRawDataIndex, ZLimbType nLimbType, size_t nCount) -{ - rawDataIndex = nRawDataIndex; - limbType = nLimbType; - count = nCount; - - ParseRawData(); -} - -void ZLimbTable::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - std::string limbTypeXml = registeredAttributes.at("LimbType").value; - limbType = ZLimb::GetTypeByAttributeName(limbTypeXml); - if (limbType == ZLimbType::Invalid) - { - HANDLE_WARNING_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'LimbType' attribute.", - "Defaulting to 'Standard'."); - limbType = ZLimbType::Standard; - } - - count = StringHelper::StrToL(registeredAttributes.at("Count").value); - - enumName = registeredAttributes.at("EnumName").value; - limbNoneName = registeredAttributes.at("LimbNone").value; - limbMaxName = registeredAttributes.at("LimbMax").value; - - if (enumName != "") - { - if (limbNoneName == "" || limbMaxName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "'EnumName' attribute was used but 'LimbNone'/'LimbMax' attributes is missing", ""); - } - } - - if (limbNoneName != "") - { - if (limbMaxName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "'LimbNone' attribute was used but 'LimbMax' attribute is missing", ""); - } - } - - if (limbMaxName != "") - { - if (limbNoneName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "'LimbMax' attribute was used but 'LimbNone' attribute is missing", ""); - } - } -} - -void ZLimbTable::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - uint32_t ptr = rawDataIndex; - - limbsAddresses.reserve(count); - for (size_t i = 0; i < count; i++) - { - limbsAddresses.push_back(BitConverter::ToUInt32BE(rawData, ptr)); - ptr += 4; - } -} - -void ZLimbTable::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = name; - if (varPrefix == "") - varPrefix = prefix; - - ZResource::DeclareReferences(varPrefix); - limbsReferences.reserve(count); - for (size_t i = 0; i < count; i++) - { - segptr_t limbAddress = limbsAddresses[i]; - - if (limbAddress != 0 && GETSEGNUM(limbAddress) == parent->segment) - { - uint32_t limbOffset = Seg2Filespace(limbAddress, parent->baseAddress); - ZLimb* limb; - - if (!parent->HasDeclaration(limbOffset)) - { - limb = new ZLimb(parent); - limb->ExtractFromBinary(limbOffset, limbType); - limb->SetName(limb->GetDefaultName(varPrefix)); - limb->DeclareVar(varPrefix, ""); - limb->DeclareReferences(varPrefix); - parent->AddResource(limb); - } - else - { - limb = static_cast(parent->FindResource(limbOffset)); - assert(limb != nullptr); - assert(limb->GetResourceType() == ZResourceType::Limb); - } - - limb->limbsTable = this; - limb->SetLimbIndex(i + 1); - - limbsReferences.push_back(limb); - } - } -} - -Declaration* ZLimbTable::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, limbsAddresses.size(), bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZLimbTable::GetBodySourceCode() const -{ - std::string body; - - for (size_t i = 0; i < count; i++) - { - std::string limbName; - Globals::Instance->GetSegmentedPtrName(limbsAddresses[i], parent, "", limbName, - parent->workerID); - body += StringHelper::Sprintf("\t%s,", limbName.c_str()); - - auto& limb = limbsReferences.at(i); - std::string limbEnumName = limb->enumName; - if (limbEnumName != "") - { - body += StringHelper::Sprintf(" /* %s */", limbEnumName.c_str()); - } - - if (i + 1 < count) - body += "\n"; - } - - return body; -} - -std::string ZLimbTable::GetSourceOutputHeader([[maybe_unused]] const std::string& prefix) -{ - if (limbNoneName == "" || limbMaxName == "" || enumName == "") - { - // Don't produce a enum of any of those attributes is missing - return ""; - } - - std::string limbEnum = StringHelper::Sprintf("typedef enum %s {\n", enumName.c_str()); - - // This assumes there isn't any skeleton with more than 0x100 limbs - - limbEnum += StringHelper::Sprintf(" /* 0x00 */ %s,\n", limbNoneName.c_str()); - - size_t i = 0; - for (; i < count; i++) - { - auto& limb = limbsReferences.at(i); - std::string limbEnumName = limb->enumName; - - if (limbEnumName == "") - { - HANDLE_ERROR_RESOURCE( - WarningType::MissingAttribute, parent, this, rawDataIndex, - "Skeleton's enum attributes were used but at least one limb is missing its " - "'LimbName' attribute", - StringHelper::Sprintf("When processing limb %02i, named '%s' at offset '0x%X'", - i + 1, limb->GetName().c_str(), limb->GetRawDataIndex())); - } - - limbEnum += StringHelper::Sprintf(" /* 0x%02X */ %s,\n", i + 1, limbEnumName.c_str()); - } - - limbEnum += StringHelper::Sprintf(" /* 0x%02X */ %s\n", i + 1, limbMaxName.c_str()); - - limbEnum += StringHelper::Sprintf("} %s;\n", enumName.c_str()); - - return limbEnum; -} - -std::string ZLimbTable::GetSourceTypeName() const -{ - switch (limbType) - { - case ZLimbType::Standard: - case ZLimbType::LOD: - case ZLimbType::Skin: - return "void*"; - - case ZLimbType::Curve: - case ZLimbType::Legacy: - return StringHelper::Sprintf("%s*", ZLimb::GetSourceTypeName(limbType)); - - case ZLimbType::Invalid: - // TODO: Proper error message or something. - assert("Invalid limb type.\n"); - } - - return "ERROR"; -} - -ZResourceType ZLimbTable::GetResourceType() const -{ - return ZResourceType::LimbTable; -} - -size_t ZLimbTable::GetRawDataSize() const -{ - return 4 * limbsAddresses.size(); -} - -std::string ZLimbTable::GetLimbEnumName(uint8_t limbIndex) const -{ - if (limbIndex == 0xFF) - { - return "LIMB_DONE"; - } - - if (limbIndex < count) - { - std::string limbEnumName = limbsReferences.at(limbIndex)->enumName; - if (limbEnumName != "") - { - return StringHelper::Sprintf("%s - 1", limbEnumName.c_str()); - } - } - else - { - HANDLE_WARNING_RESOURCE(WarningType::InvalidExtractedData, parent, this, rawDataIndex, - StringHelper::Sprintf("Limb index '%02i' out of range", limbIndex), - ""); - } - - return StringHelper::Sprintf("0x%02X", limbIndex); -} diff --git a/ZAPDTR/ZAPD/ZSkeleton.h b/ZAPDTR/ZAPD/ZSkeleton.h deleted file mode 100644 index 892d5de35..000000000 --- a/ZAPDTR/ZAPD/ZSkeleton.h +++ /dev/null @@ -1,85 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "ZDisplayList.h" -#include "ZFile.h" -#include "ZLimb.h" - -enum class ZSkeletonType -{ - Normal, - Flex, - Curve, -}; - -class ZLimbTable : public ZResource -{ -public: - ZLimbType limbType = ZLimbType::Standard; - size_t count = 0; - - std::vector limbsAddresses; - std::vector limbsReferences; // borrowed pointers, do not delete! - - // XML attributes - std::string enumName; - std::string limbNoneName; - std::string limbMaxName; - - ZLimbTable(ZFile* nParent); - - void ExtractFromBinary(uint32_t nRawDataIndex, ZLimbType nLimbType, size_t nCount); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceOutputHeader([[maybe_unused]] const std::string& prefix); - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - - std::string GetLimbEnumName(uint8_t limbIndex) const; -}; - -class ZSkeleton : public ZResource -{ -public: - ZSkeletonType type = ZSkeletonType::Normal; - ZLimbType limbType = ZLimbType::Standard; - std::string enumName; - std::string limbNoneName; - std::string limbMaxName; - - segptr_t limbsArrayAddress; - uint8_t limbCount = 0; - uint8_t dListCount = 0; // FLEX SKELETON ONLY - - ZSkeleton(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; - - uint8_t GetLimbCount(); - - ZLimbTable* limbsTable = nullptr; // borrowed pointer, do not delete! - -}; diff --git a/ZAPDTR/ZAPD/ZString.cpp b/ZAPDTR/ZAPD/ZString.cpp deleted file mode 100644 index 4a9069496..000000000 --- a/ZAPDTR/ZAPD/ZString.cpp +++ /dev/null @@ -1,69 +0,0 @@ -#include "ZString.h" - -#include -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(String, ZString); - -ZString::ZString(ZFile* nParent) : ZResource(nParent) -{ -} - -void ZString::ParseRawData() -{ - size_t size = 0; - const auto& rawData = parent->GetRawData(); - const auto& rawDataArr = rawData.data(); - size_t rawDataSize = rawData.size(); - for (size_t i = rawDataIndex; i < rawDataSize; ++i) - { - ++size; - if (rawDataArr[i] == '\0') - { - break; - } - } - - auto dataStart = rawData.begin() + rawDataIndex; - strData.assign(dataStart, dataStart + size); -} - -Declaration* ZString::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, 0, bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZString::GetBodySourceCode() const -{ - return StringHelper::Sprintf("\t\"%s\"", strData.data()); -} - -std::string ZString::GetSourceOutputHeader([[maybe_unused]] const std::string& prefix, std::set *nameSet) -{ - return StringHelper::Sprintf("#define %s_macro \"%s\"", name.c_str(), strData.data()); -} - -std::string ZString::GetSourceTypeName() const -{ - return "char"; -} - -ZResourceType ZString::GetResourceType() const -{ - return ZResourceType::String; -} - -size_t ZString::GetRawDataSize() const -{ - return strData.size(); -} diff --git a/ZAPDTR/ZAPD/ZString.h b/ZAPDTR/ZAPD/ZString.h deleted file mode 100644 index 19f615a90..000000000 --- a/ZAPDTR/ZAPD/ZString.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "tinyxml2.h" - -class ZString : public ZResource -{ -public: - ZString(ZFile* nParent); - - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - std::string GetSourceOutputHeader(const std::string& prefix, std::set *nameSet) override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; - -protected: - std::vector strData; -}; diff --git a/ZAPDTR/ZAPD/ZSurfaceType.cpp b/ZAPDTR/ZAPD/ZSurfaceType.cpp deleted file mode 100644 index 27e73accc..000000000 --- a/ZAPDTR/ZAPD/ZSurfaceType.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "ZSurfaceType.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" - -REGISTER_ZFILENODE(SurfaceType, ZSurfaceType); - -ZSurfaceType::ZSurfaceType(ZFile* nParent) : ZResource(nParent) -{ -} - -ZSurfaceType::~ZSurfaceType() -{ -} - -void ZSurfaceType::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - data[0] = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0); - data[1] = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); -} - -void ZSurfaceType::DeclareReferences(const std::string& prefix) -{ - std::string declaration; - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - parent->AddDeclaration(rawDataIndex, DeclarationAlignment::Align4, GetRawDataSize(), - GetSourceTypeName(), name.c_str(), GetBodySourceCode()); -} - -std::string ZSurfaceType::GetBodySourceCode() const -{ - return StringHelper::Sprintf("{0x%08X, 0x%08X}", data[0], data[1]); -} - -std::string ZSurfaceType::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sSurfaceType_%06X", prefix.c_str(), rawDataIndex); -} - -ZResourceType ZSurfaceType::GetResourceType() const -{ - return ZResourceType::SurfaceType; -} - -size_t ZSurfaceType::GetRawDataSize() const -{ - return 8; -} - -std::string ZSurfaceType::GetSourceTypeName() const -{ - return "SurfaceType"; -} - -bool ZSurfaceType::DoesSupportArray() const -{ - return true; -} diff --git a/ZAPDTR/ZAPD/ZSurfaceType.h b/ZAPDTR/ZAPD/ZSurfaceType.h deleted file mode 100644 index 3bbddee8c..000000000 --- a/ZAPDTR/ZAPD/ZSurfaceType.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include -#include "ZFile.h" -#include "ZResource.h" - -class ZSurfaceType : public ZResource -{ -public: - std::array data; - - ZSurfaceType(ZFile* nParent); - ~ZSurfaceType(); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - bool DoesSupportArray() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZSymbol.cpp b/ZAPDTR/ZAPD/ZSymbol.cpp deleted file mode 100644 index b5df68669..000000000 --- a/ZAPDTR/ZAPD/ZSymbol.cpp +++ /dev/null @@ -1,98 +0,0 @@ -#include "ZSymbol.h" - -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Symbol, ZSymbol); - -ZSymbol::ZSymbol(ZFile* nParent) : ZResource(nParent) -{ - RegisterOptionalAttribute("Type"); - RegisterOptionalAttribute("TypeSize"); - RegisterOptionalAttribute("Count"); -} - -void ZSymbol::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - std::string typeXml = registeredAttributes.at("Type").value; - - if (typeXml == "") - { - HANDLE_WARNING_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - "missing 'Type' attribute in ", "Defaulting to 'void*'."); - type = "void*"; - } - else - { - type = typeXml; - } - - std::string typeSizeXml = registeredAttributes.at("TypeSize").value; - if (typeSizeXml == "") - { - HANDLE_WARNING_RESOURCE(WarningType::MissingAttribute, parent, this, rawDataIndex, - "missing 'TypeSize' attribute in ", "Defaulting to '4'."); - typeSize = 4; // Size of a word. - } - else - { - typeSize = StringHelper::StrToL(typeSizeXml, 0); - } - - if (registeredAttributes.at("Count").wasSet) - { - isArray = true; - - std::string countXml = registeredAttributes.at("Count").value; - if (countXml != "") - count = StringHelper::StrToL(countXml, 0); - } - - if (registeredAttributes.at("Static").value == "On") - { - HANDLE_WARNING_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "a cannot be marked as static", - "Disabling static for this resource."); - } - staticConf = StaticConfig::Off; -} - -Declaration* ZSymbol::DeclareVar([[maybe_unused]] const std::string& prefix, - [[maybe_unused]] const std::string& bodyStr) -{ - return nullptr; -} - -size_t ZSymbol::GetRawDataSize() const -{ - if (isArray) - return count * typeSize; - - return typeSize; -} - -std::string ZSymbol::GetSourceOutputHeader([[maybe_unused]] const std::string& prefix, std::set *nameSet) -{ - if (isArray) - { - if (count == 0) - return StringHelper::Sprintf("extern %s %s[];\n", type.c_str(), name.c_str()); - else - return StringHelper::Sprintf("extern %s %s[%i];\n", type.c_str(), name.c_str(), count); - } - - return StringHelper::Sprintf("extern %s %s;\n", type.c_str(), name.c_str()); -} - -std::string ZSymbol::GetSourceTypeName() const -{ - return type; -} - -ZResourceType ZSymbol::GetResourceType() const -{ - return ZResourceType::Symbol; -} diff --git a/ZAPDTR/ZAPD/ZSymbol.h b/ZAPDTR/ZAPD/ZSymbol.h deleted file mode 100644 index e00f14c6b..000000000 --- a/ZAPDTR/ZAPD/ZSymbol.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "tinyxml2.h" - -class ZSymbol : public ZResource -{ -protected: - std::string type; - size_t typeSize; - bool isArray = false; - uint32_t count = 0; - -public: - ZSymbol(ZFile* nParent); - - void ParseXML(tinyxml2::XMLElement* reader) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - - std::string GetSourceOutputHeader(const std::string& prefix, std::set *nameSet) override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZText.cpp b/ZAPDTR/ZAPD/ZText.cpp deleted file mode 100644 index 95e4b5236..000000000 --- a/ZAPDTR/ZAPD/ZText.cpp +++ /dev/null @@ -1,137 +0,0 @@ -#include "ZText.h" - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/Path.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Text, ZText); - -ZText::ZText(ZFile* nParent) : ZResource(nParent) -{ - RegisterRequiredAttribute("CodeOffset"); - RegisterOptionalAttribute("LangOffset", "0"); -} - -void ZText::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - uint32_t currentPtr = StringHelper::StrToL(registeredAttributes.at("CodeOffset").value, 16); - uint32_t langPtr = currentPtr; - bool isPalLang = false; - - if (StringHelper::StrToL(registeredAttributes.at("LangOffset").value, 16) != 0) - { - langPtr = StringHelper::StrToL(registeredAttributes.at("LangOffset").value, 16); - - if (langPtr != currentPtr) - isPalLang = true; - } - - std::vector codeData; - - if (Globals::Instance->fileMode == ZFileMode::ExtractDirectory) - codeData = Globals::Instance->GetBaseromFile("code"); - else - codeData = Globals::Instance->GetBaseromFile(Globals::Instance->baseRomPath.string() + "code"); - - while (true) - { - MessageEntry msgEntry; - msgEntry.id = BitConverter::ToInt16BE(codeData, currentPtr + 0); - msgEntry.textboxType = (codeData[currentPtr + 2] & 0xF0) >> 4; - msgEntry.textboxYPos = (codeData[currentPtr + 2] & 0x0F); - - if (isPalLang) - { - msgEntry.segmentId = (codeData[langPtr + 0]); - msgEntry.msgOffset = BitConverter::ToInt32BE(codeData, langPtr + 0) & 0x00FFFFFF; - } - else - { - msgEntry.segmentId = (codeData[langPtr + 4]); - msgEntry.msgOffset = BitConverter::ToInt32BE(codeData, langPtr + 4) & 0x00FFFFFF; - } - - uint32_t msgPtr = msgEntry.msgOffset; - - unsigned char c = rawData[msgPtr]; - unsigned int extra = 0; - bool stop = false; - - // Continue parsing until we are told to stop and all extra bytes are read - while ((c != '\0' && !stop) || extra > 0) - { - msgEntry.msg += c; - msgPtr++; - - // Some control codes require reading extra bytes - if (extra == 0) - { - // End marker, so stop this message and do not read anything else - if (c == 0x02) - { - stop = true; - } - else if (c == 0x05 || c == 0x13 || c == 0x0E || c == 0x0C || c == 0x1E || c == 0x06 || - c == 0x14) - { - extra = 1; - } - // "Continue to new text ID", so stop this message and read two more bytes for the text ID - else if (c == 0x07) - { - extra = 2; - stop = true; - } - else if (c == 0x12 || c == 0x11) - { - extra = 2; - } - else if (c == 0x15) - { - extra = 3; - } - } - else - { - extra--; - } - - c = rawData[msgPtr]; - } - - messages.push_back(msgEntry); - - if (msgEntry.id == 0xFFFC || msgEntry.id == 0xFFFF) - break; - - currentPtr += 8; - - if (isPalLang) - langPtr += 4; - else - langPtr += 8; - } - - int bp2 = 0; -} - -std::string ZText::GetSourceTypeName() const -{ - return "u8"; -} - -size_t ZText::GetRawDataSize() const -{ - return 1; -} - -ZResourceType ZText::GetResourceType() const -{ - return ZResourceType::Text; -} diff --git a/ZAPDTR/ZAPD/ZText.h b/ZAPDTR/ZAPD/ZText.h deleted file mode 100644 index 37b9c66a9..000000000 --- a/ZAPDTR/ZAPD/ZText.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "ZResource.h" -#include "tinyxml2.h" - -class MessageEntry -{ -public: - uint16_t id; - uint8_t textboxType; - uint8_t textboxYPos; - uint32_t segmentId; - uint32_t msgOffset; - std::string msg; -}; - -class ZText : public ZResource -{ -public: - std::vector messages; - - ZText(ZFile* nParent); - - void ParseRawData() override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - - size_t GetRawDataSize() const override; -}; diff --git a/ZAPDTR/ZAPD/ZTexture.cpp b/ZAPDTR/ZAPD/ZTexture.cpp deleted file mode 100644 index 5184b834b..000000000 --- a/ZAPDTR/ZAPD/ZTexture.cpp +++ /dev/null @@ -1,974 +0,0 @@ -#include "ZTexture.h" - -#include - -#include "CRC32.h" -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "Utils/Directory.h" -#include -#include "Utils/Path.h" -#include "WarningHandler.h" - -REGISTER_ZFILENODE(Texture, ZTexture); - -ZTexture::ZTexture(ZFile* nParent) : ZResource(nParent) -{ - width = 0; - height = 0; - dWordAligned = true; - genOTRDef = true; - splitTlut = false; - - RegisterRequiredAttribute("Width"); - RegisterRequiredAttribute("Height"); - RegisterRequiredAttribute("Format"); - RegisterOptionalAttribute("TlutOffset"); - RegisterOptionalAttribute("ExternalTlut"); - RegisterOptionalAttribute("ExternalTlutOffset"); - RegisterOptionalAttribute("SplitTlut"); - - // Dummy property added by https://github.com/HarbourMasters/Shipwright/pull/3161 - // Used to indicate if a resource definition was added through a script - // and to enable easy removal/re-add of the definitions when introducing new rom support - // Can be removed once we feel it is no longer useful - // This is not used in ZAPD itself, the registration is to prevent missing attribute errors - RegisterOptionalAttribute("AddedByScript"); -} - -void ZTexture::ExtractFromBinary(uint32_t nRawDataIndex, int32_t nWidth, int32_t nHeight, - TextureType nType, bool nIsPalette) -{ - width = nWidth; - height = nHeight; - format = nType; - rawDataIndex = nRawDataIndex; - isPalette = nIsPalette; - name = GetDefaultName(parent->GetName()); - outName = name; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); - CalcHash(); -} - -void ZTexture::FromPNG(const fs::path& pngFilePath, TextureType texType) -{ - format = texType; - name = StringHelper::Split(Path::GetFileNameWithoutExtension(pngFilePath.string()), ".")[0]; - PrepareRawDataFromFile(pngFilePath); -} - -void ZTexture::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - std::string widthXml = registeredAttributes.at("Width").value; - std::string heightXml = registeredAttributes.at("Height").value; - std::string SplitTlutXml = registeredAttributes.at("SplitTlut").value; - - if (!StringHelper::HasOnlyDigits(widthXml)) - { - std::string errorHeader = StringHelper::Sprintf( - "value of 'Width' attribute has non-decimal digits: '%s'", widthXml.c_str()); - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - errorHeader, ""); - } - if (!StringHelper::HasOnlyDigits(heightXml)) - { - std::string errorHeader = StringHelper::Sprintf( - "value of 'Height' attribute has non-decimal digits: '%s'", heightXml.c_str()); - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - errorHeader, ""); - } - - if (!registeredAttributes.at("ExternalTlut").wasSet && - registeredAttributes.at("SplitTlut").wasSet) - { - std::string errorHeader = - StringHelper::Sprintf("SplitTlut set without using an external tlut"); - HANDLE_WARNING_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - errorHeader, ""); - } - - if (!SplitTlutXml.empty()) - { - if (!tinyxml2::XMLUtil::ToBool(SplitTlutXml.c_str(), &splitTlut)) - { - std::string errorHeader = StringHelper::Sprintf( - "Invalid value passed to SplitTlut: '%s'. Valid values are true, false, 1, 0", - SplitTlutXml.c_str()); - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - errorHeader, ""); - } - } - - width = StringHelper::StrToL(widthXml); - height = StringHelper::StrToL(heightXml); - - std::string formatStr = registeredAttributes.at("Format").value; - format = GetTextureTypeFromString(formatStr); - - if (format == TextureType::Error) - { - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - "invalid value found for 'Format' attribute", ""); - } - - const auto& tlutOffsetAttr = registeredAttributes.at("TlutOffset"); - if (tlutOffsetAttr.wasSet) - { - switch (format) - { - case TextureType::Palette4bpp: - case TextureType::Palette8bpp: - tlutOffset = StringHelper::StrToL(tlutOffsetAttr.value, 16); - break; - - default: - HANDLE_ERROR_RESOURCE(WarningType::InvalidXML, parent, this, rawDataIndex, - "'TlutOffset' declared in non color-indexed (ci4 or ci8) texture", - ""); - break; - } - } -} - -void ZTexture::ParseRawData() -{ - if (rawDataIndex % 8 != 0) - dWordAligned = false; - - switch (format) - { - case TextureType::RGBA16bpp: - PrepareBitmapRGBA16(); - break; - case TextureType::RGBA32bpp: - PrepareBitmapRGBA32(); - break; - case TextureType::Grayscale4bpp: - PrepareBitmapGrayscale4(); - break; - case TextureType::Grayscale8bpp: - PrepareBitmapGrayscale8(); - break; - case TextureType::GrayscaleAlpha4bpp: - PrepareBitmapGrayscaleAlpha4(); - break; - case TextureType::GrayscaleAlpha8bpp: - PrepareBitmapGrayscaleAlpha8(); - break; - case TextureType::GrayscaleAlpha16bpp: - PrepareBitmapGrayscaleAlpha16(); - break; - case TextureType::Palette4bpp: - PrepareBitmapPalette4(); - break; - case TextureType::Palette8bpp: - PrepareBitmapPalette8(); - break; - case TextureType::Error: - HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex, - StringHelper::Sprintf("Invalid texture format", format), ""); - assert(!"TODO"); - break; - } -} - -void ZTexture::ParseRawDataLate() -{ - if (registeredAttributes["ExternalTlut"].wasSet) - { - const std::string externPalette = registeredAttributes["ExternalTlut"].value; - for (const auto& file : Globals::Instance->files) - { - if (file->GetName() == externPalette) - { - offset_t palOffset = 0; - if (registeredAttributes["ExternalTlutOffset"].wasSet) - { - palOffset = - StringHelper::StrToL(registeredAttributes["ExternalTlutOffset"].value, 16); - } - else - { - HANDLE_WARNING_RESOURCE( - WarningType::MissingOffsets, parent, this, rawDataIndex, - StringHelper::Sprintf( - "No ExternalTlutOffset Given. Assuming offset of 0x0"), - ""); - } - for (const auto& res : file->resources) - { - if (res->GetRawDataIndex() == palOffset) - { - ZTexture* palette = (ZTexture*)res; - ZTexture tlutTemp(file); - - tlut = &tlutTemp; - tlut->ExtractFromBinary(palOffset, palette->width, palette->height, - TextureType::RGBA16bpp, true); - SetTlut(tlut); - } - } - } - } - } -} - -void ZTexture::PrepareBitmapRGBA16() -{ - textureData.InitEmptyRGBImage(width, height, true); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - int32_t pos = rawDataIndex + ((y * width) + x) * 2; - uint16_t data = parentRawData.at(pos + 1) | (parentRawData.at(pos) << 8); - uint8_t r = (data & 0xF800) >> 11; - uint8_t g = (data & 0x07C0) >> 6; - uint8_t b = (data & 0x003E) >> 1; - uint8_t alpha = data & 0x01; - - textureData.SetRGBPixel(y, x, r * 8, g * 8, b * 8, alpha * 255); - } - } -} - -void ZTexture::PrepareBitmapRGBA32() -{ - textureData.InitEmptyRGBImage(width, height, true); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - size_t pos = rawDataIndex + ((y * width) + x) * 4; - uint8_t r = parentRawData.at(pos + 0); - uint8_t g = parentRawData.at(pos + 1); - uint8_t b = parentRawData.at(pos + 2); - uint8_t alpha = parentRawData.at(pos + 3); - - textureData.SetRGBPixel(y, x, r, g, b, alpha); - } - } -} - -void ZTexture::PrepareBitmapGrayscale4() -{ - textureData.InitEmptyRGBImage(width, height, false); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x += 2) - { - for (uint8_t i = 0; i < 2; i++) - { - size_t pos = rawDataIndex + ((y * width) + x) / 2; - uint8_t grayscale = 0; - - if (i == 0) - grayscale = parentRawData.at(pos) & 0xF0; - else - grayscale = (parentRawData.at(pos) & 0x0F) << 4; - - textureData.SetGrayscalePixel(y, x + i, grayscale); - } - } - } -} - -void ZTexture::PrepareBitmapGrayscale8() -{ - textureData.InitEmptyRGBImage(width, height, false); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - size_t pos = rawDataIndex + ((y * width) + x) * 1; - - textureData.SetGrayscalePixel(y, x, parentRawData.at(pos)); - } - } -} - -void ZTexture::PrepareBitmapGrayscaleAlpha4() -{ - textureData.InitEmptyRGBImage(width, height, true); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x += 2) - { - for (uint16_t i = 0; i < 2; i++) - { - size_t pos = rawDataIndex + ((y * width) + x) / 2; - uint8_t data = 0; - - if (i == 0) - data = (parentRawData.at(pos) & 0xF0) >> 4; - else - data = parentRawData.at(pos) & 0x0F; - - uint8_t grayscale = ((data & 0x0E) >> 1) * 32; - uint8_t alpha = (data & 0x01) * 255; - - textureData.SetGrayscalePixel(y, x + i, grayscale, alpha); - } - } - } -} - -void ZTexture::PrepareBitmapGrayscaleAlpha8() -{ - textureData.InitEmptyRGBImage(width, height, true); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - size_t pos = rawDataIndex + ((y * width) + x) * 1; - uint8_t grayscale = parentRawData.at(pos) & 0xF0; - uint8_t alpha = (parentRawData.at(pos) & 0x0F) << 4; - - textureData.SetGrayscalePixel(y, x, grayscale, alpha); - } - } -} - -void ZTexture::PrepareBitmapGrayscaleAlpha16() -{ - textureData.InitEmptyRGBImage(width, height, true); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - size_t pos = rawDataIndex + ((y * width) + x) * 2; - uint8_t grayscale = parentRawData.at(pos + 0); - uint8_t alpha = parentRawData.at(pos + 1); - - textureData.SetGrayscalePixel(y, x, grayscale, alpha); - } - } -} - -void ZTexture::PrepareBitmapPalette4() -{ - textureData.InitEmptyPaletteImage(width, height); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x += 2) - { - for (uint16_t i = 0; i < 2; i++) - { - size_t pos = rawDataIndex + ((y * width) + x) / 2; - uint8_t paletteIndex = 0; - - if (i == 0) - paletteIndex = (parentRawData.at(pos) & 0xF0) >> 4; - else - paletteIndex = (parentRawData.at(pos) & 0x0F); - - textureData.SetIndexedPixel(y, x + i, paletteIndex, paletteIndex * 16); - } - } - } -} - -void ZTexture::PrepareBitmapPalette8() -{ - textureData.InitEmptyPaletteImage(width, height); - auto parentRawData = parent->GetRawData(); - for (size_t y = 0; y < height; y++) - { - for (size_t x = 0; x < width; x++) - { - size_t pos = rawDataIndex + ((y * width) + x) * 1; - uint8_t grayscale = parentRawData.at(pos); - - textureData.SetIndexedPixel(y, x, grayscale, grayscale); - } - } -} - -void ZTexture::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (tlutOffset != static_cast(-1)) - { - tlut = parent->GetTextureResource(tlutOffset); - if (tlut == nullptr) - { - int32_t tlutDim = 16; - if (format == TextureType::Palette4bpp) - tlutDim = 4; - - tlut = new ZTexture(parent); - tlut->ExtractFromBinary(tlutOffset, tlutDim, tlutDim, TextureType::RGBA16bpp, true); - parent->AddTextureResource(tlutOffset, tlut); - tlut->DeclareVar(prefix, ""); - } - else - { - tlut->isPalette = true; - } - SetTlut(tlut); - } -} - -void ZTexture::PrepareRawDataFromFile(const fs::path& pngFilePath) -{ - textureData.ReadPng(pngFilePath); - - width = textureData.GetWidth(); - height = textureData.GetHeight(); - - textureDataRaw.clear(); - textureDataRaw.resize(GetRawDataSize()); - - switch (format) - { - case TextureType::RGBA16bpp: - PrepareRawDataRGBA16(); - break; - case TextureType::RGBA32bpp: - PrepareRawDataRGBA32(); - break; - case TextureType::Grayscale4bpp: - PrepareRawDataGrayscale4(); - break; - case TextureType::Grayscale8bpp: - PrepareRawDataGrayscale8(); - break; - case TextureType::GrayscaleAlpha4bpp: - PrepareRawDataGrayscaleAlpha4(); - break; - case TextureType::GrayscaleAlpha8bpp: - PrepareRawDataGrayscaleAlpha8(); - break; - case TextureType::GrayscaleAlpha16bpp: - PrepareRawDataGrayscaleAlpha16(); - break; - case TextureType::Palette4bpp: - PrepareRawDataPalette4(); - break; - case TextureType::Palette8bpp: - PrepareRawDataPalette8(); - break; - case TextureType::Error: - HANDLE_ERROR_PROCESS(WarningType::InvalidPNG, "Input PNG file has invalid format type", ""); - break; - } -} - -void ZTexture::PrepareRawDataRGBA16() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = ((y * width) + x) * 2; - RGBAPixel pixel = textureData.GetPixel(y, x); - - uint8_t r = pixel.r / 8; - uint8_t g = pixel.g / 8; - uint8_t b = pixel.b / 8; - - uint8_t alphaBit = pixel.a != 0; - - uint16_t data = (r << 11) + (g << 6) + (b << 1) + alphaBit; - - textureDataRaw[pos + 0] = (data & 0xFF00) >> 8; - textureDataRaw[pos + 1] = (data & 0x00FF); - } - } -} - -void ZTexture::PrepareRawDataRGBA32() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = ((y * width) + x) * 4; - RGBAPixel pixel = textureData.GetPixel(y, x); - - textureDataRaw[pos + 0] = pixel.r; - textureDataRaw[pos + 1] = pixel.g; - textureDataRaw[pos + 2] = pixel.b; - textureDataRaw[pos + 3] = pixel.a; - } - } -} - -void ZTexture::PrepareRawDataGrayscale4() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x += 2) - { - size_t pos = ((y * width) + x) / 2; - uint8_t r1 = textureData.GetPixel(y, x).r; - uint8_t r2 = textureData.GetPixel(y, x + 1).r; - - textureDataRaw[pos] = (uint8_t)(((r1 / 16) << 4) + (r2 / 16)); - } - } -} - -void ZTexture::PrepareRawDataGrayscale8() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = (y * width) + x; - RGBAPixel pixel = textureData.GetPixel(y, x); - textureDataRaw[pos] = pixel.r; - } - } -} - -void ZTexture::PrepareRawDataGrayscaleAlpha4() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x += 2) - { - size_t pos = ((y * width) + x) / 2; - uint8_t data = 0; - - for (uint16_t i = 0; i < 2; i++) - { - RGBAPixel pixel = textureData.GetPixel(y, x + i); - uint8_t cR = pixel.r; - uint8_t alphaBit = pixel.a != 0; - - if (i == 0) - data |= (((cR / 32) << 1) + alphaBit) << 4; - else - data |= ((cR / 32) << 1) + alphaBit; - } - - textureDataRaw[pos] = data; - } - } -} - -void ZTexture::PrepareRawDataGrayscaleAlpha8() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = ((y * width) + x) * 1; - RGBAPixel pixel = textureData.GetPixel(y, x); - - uint8_t r = pixel.r; - uint8_t a = pixel.a; - - textureDataRaw[pos] = ((r / 16) << 4) + (a / 16); - } - } -} - -void ZTexture::PrepareRawDataGrayscaleAlpha16() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = ((y * width) + x) * 2; - RGBAPixel pixel = textureData.GetPixel(y, x); - - uint8_t cR = pixel.r; - uint8_t aR = pixel.a; - - textureDataRaw[pos + 0] = cR; - textureDataRaw[pos + 1] = aR; - } - } -} - -void ZTexture::PrepareRawDataPalette4() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x += 2) - { - size_t pos = ((y * width) + x) / 2; - - uint8_t cR1 = textureData.GetIndexedPixel(y, x); - uint8_t cR2 = textureData.GetIndexedPixel(y, x + 1); - - textureDataRaw[pos] = (cR1 << 4) | (cR2); - } - } -} - -void ZTexture::PrepareRawDataPalette8() -{ - for (uint16_t y = 0; y < height; y++) - { - for (uint16_t x = 0; x < width; x++) - { - size_t pos = ((y * width) + x); - uint8_t cR = textureData.GetIndexedPixel(y, x); - - textureDataRaw[pos] = cR; - } - } -} - -float ZTexture::GetPixelMultiplyer() const -{ - switch (format) - { - case TextureType::Grayscale4bpp: - case TextureType::GrayscaleAlpha4bpp: - case TextureType::Palette4bpp: - return 0.5f; - case TextureType::Grayscale8bpp: - case TextureType::GrayscaleAlpha8bpp: - case TextureType::Palette8bpp: - return 1; - case TextureType::GrayscaleAlpha16bpp: - case TextureType::RGBA16bpp: - return 2; - case TextureType::RGBA32bpp: - return 4; - default: - return -1; - } -} - -size_t ZTexture::GetRawDataSize() const -{ - return (width * height * GetPixelMultiplyer()); -} - -std::string ZTexture::GetIMFmtFromType() -{ - switch (format) - { - case TextureType::RGBA32bpp: - case TextureType::RGBA16bpp: - return "G_IM_FMT_RGBA"; - case TextureType::Grayscale4bpp: - case TextureType::Grayscale8bpp: - return "G_IM_FMT_I"; - case TextureType::Palette4bpp: - case TextureType::Palette8bpp: - return "G_IM_FMT_CI"; - case TextureType::GrayscaleAlpha4bpp: - case TextureType::GrayscaleAlpha8bpp: - case TextureType::GrayscaleAlpha16bpp: - return "G_IM_FMT_IA"; - default: - return "ERROR"; - } -} - -std::string ZTexture::GetIMSizFromType() -{ - switch (format) - { - case TextureType::Grayscale4bpp: - case TextureType::Palette4bpp: - case TextureType::GrayscaleAlpha4bpp: - return "G_IM_SIZ_4b"; - case TextureType::Palette8bpp: - case TextureType::Grayscale8bpp: - return "G_IM_SIZ_8b"; - case TextureType::GrayscaleAlpha16bpp: - case TextureType::RGBA16bpp: - return "G_IM_SIZ_16b"; - case TextureType::RGBA32bpp: - return "G_IM_SIZ_32b"; - default: - return "ERROR"; - } -} - -std::string ZTexture::GetDefaultName(const std::string& prefix) const -{ - const char* suffix = "Tex"; - if (isPalette) - suffix = "TLUT"; - return StringHelper::Sprintf("%s%s_%06X", prefix.c_str(), suffix, rawDataIndex); -} - -uint32_t ZTexture::GetWidth() const -{ - return width; -} - -uint32_t ZTexture::GetHeight() const -{ - return height; -} - -void ZTexture::SetDimensions(uint32_t nWidth, uint32_t nHeight) -{ - width = nWidth; - height = nHeight; - ParseRawData(); -} - -TextureType ZTexture::GetTextureType() const -{ - return format; -} - - -void ZTexture::Save(const fs::path& outFolder) -{ - // Optionally generate text file containing CRC information. This is going to be a one time - // process for generating the Texture Pool XML. - if (Globals::Instance->outputCrc) - { - DiskFile::WriteAllText((Globals::Instance->outputPath / (outName + ".txt")).string(), - StringHelper::Sprintf("%08lX", hash)); - } - - // Do not save png files if we're making an OTR file. They're not needed... - if (Globals::Instance->otrMode) - return; - - auto outPath = GetPoolOutPath(outFolder); - - if (!Directory::Exists(outPath.string())) - Directory::CreateDirectory(outPath.string()); - - fs::path outFileName; - - if (!dWordAligned) - outFileName = outPath / (outName + ".u32" + "." + GetExternalExtension() + ".png"); - else - outFileName = outPath / (outName + +"." + GetExternalExtension() + ".png"); - -#ifdef TEXTURE_DEBUG - printf("Saving PNG: %s\n", outFileName.c_str()); - printf("\t Var name: %s\n", name.c_str()); - if (tlut != nullptr) - printf("\t TLUT name: %s\n", tlut->name.c_str()); -#endif - - textureData.WritePng(outFileName); - -#ifdef TEXTURE_DEBUG - printf("\n"); -#endif -} - -Declaration* ZTexture::DeclareVar(const std::string& prefix, - [[maybe_unused]] const std::string& bodyStr) -{ - std::string auxName = name; - std::string auxOutName = outName; - std::string incStr; - - //if (Globals::Instance->otrMode) - //return nullptr; - - if (auxName == "") - auxName = GetDefaultName(prefix); - - if (auxOutName == "") - auxOutName = GetDefaultName(prefix); - - auto filepath = Globals::Instance->outputPath / fs::path(auxOutName).stem(); - - if (dWordAligned) - incStr = - StringHelper::Sprintf("%s.%s.inc.c", filepath.c_str(), GetExternalExtension().c_str()); - else - incStr = StringHelper::Sprintf("%s.u32.%s.inc.c", filepath.c_str(), - GetExternalExtension().c_str()); - - if (!Globals::Instance->cfg.texturePool.empty()) - { - CalcHash(); - - // TEXTURE POOL CHECK - const auto& poolEntry = Globals::Instance->cfg.texturePool.find(hash); - if (poolEntry != Globals::Instance->cfg.texturePool.end()) - { - if (dWordAligned) - incStr = StringHelper::Sprintf("%s.%s.inc.c", poolEntry->second.path.c_str(), - GetExternalExtension().c_str()); - else - incStr = StringHelper::Sprintf("%s.u32.%s.inc.c", poolEntry->second.path.c_str(), - GetExternalExtension().c_str()); - } - } - size_t texSizeDivisor = (dWordAligned) ? 8 : 4; - - Declaration* decl = parent->AddDeclarationIncludeArray(rawDataIndex, incStr, GetRawDataSize(), - GetSourceTypeName(), auxName, - GetRawDataSize() / texSizeDivisor); - decl->staticConf = staticConf; - return decl; -} - -std::string ZTexture::GetBodySourceCode() const -{ - std::string sourceOutput; - - if (!Globals::Instance->otrMode) - { - size_t texSizeInc = (dWordAligned) ? 8 : 4; - for (size_t i = 0; i < textureDataRaw.size(); i += texSizeInc) - { - if (i % 32 == 0) - sourceOutput += " "; - if (dWordAligned) - sourceOutput += StringHelper::Sprintf("0x%016llX, ", - BitConverter::ToUInt64BE(textureDataRaw, i)); - else - sourceOutput += StringHelper::Sprintf("0x%08llX, ", - BitConverter::ToUInt32BE(textureDataRaw, i)); - if (i % 32 == 24) - sourceOutput += - StringHelper::Sprintf(" // 0x%06X \n", rawDataIndex + ((i / 32) * 32)); - } - - // Ensure there's always a trailing line feed to prevent dumb warnings. - // Please don't remove this line, unless you somehow made a way to prevent - // that warning when building the OoT repo. - sourceOutput += "\n"; - } else if (Globals::Instance->buildRawTexture) { - sourceOutput += std::string(textureDataRaw.begin(), textureDataRaw.end()); - } - - return sourceOutput; -} - -bool ZTexture::IsExternalResource() const -{ - return true; -} - -ZResourceType ZTexture::GetResourceType() const -{ - return ZResourceType::Texture; -} - -std::string ZTexture::GetSourceTypeName() const -{ - return dWordAligned ? "u64" : "u32"; -} - -void ZTexture::CalcHash() -{ - //if (hash == 0) - { - const auto& parentRawData = parent->GetRawData(); - hash = CRC32B(parentRawData.data() + rawDataIndex, GetRawDataSize()); - } -} - -std::string ZTexture::GetExternalExtension() const -{ - switch (format) - { - case TextureType::RGBA32bpp: - return "rgba32"; - case TextureType::RGBA16bpp: - return "rgba16"; - case TextureType::Grayscale4bpp: - return "i4"; - case TextureType::Grayscale8bpp: - return "i8"; - case TextureType::GrayscaleAlpha4bpp: - return "ia4"; - case TextureType::GrayscaleAlpha8bpp: - return "ia8"; - case TextureType::GrayscaleAlpha16bpp: - return "ia16"; - case TextureType::Palette4bpp: - return "ci4"; - case TextureType::Palette8bpp: - return "ci8"; - default: - return "ERROR"; - } -} - -fs::path ZTexture::GetPoolOutPath(const fs::path& defaultValue) -{ - if (Globals::Instance->cfg.texturePool.find(hash) != Globals::Instance->cfg.texturePool.end()) - return Path::GetDirectoryName(Globals::Instance->cfg.texturePool[hash].path.string()); - - return defaultValue; -} - -TextureType ZTexture::GetTextureTypeFromString(const std::string& str) -{ - TextureType texType = TextureType::Error; - - if (str == "rgba32") - texType = TextureType::RGBA32bpp; - else if (str == "rgba16") - texType = TextureType::RGBA16bpp; - else if (str == "rgb5a1") - { - texType = TextureType::RGBA16bpp; - HANDLE_WARNING(WarningType::Deprecated, - "the texture format 'rgb5a1' is currently deprecated", - "It will be removed in a future version. Use the format 'rgba16' instead."); - } - else if (str == "i4") - texType = TextureType::Grayscale4bpp; - else if (str == "i8") - texType = TextureType::Grayscale8bpp; - else if (str == "ia4") - texType = TextureType::GrayscaleAlpha4bpp; - else if (str == "ia8") - texType = TextureType::GrayscaleAlpha8bpp; - else if (str == "ia16") - texType = TextureType::GrayscaleAlpha16bpp; - else if (str == "ci4") - texType = TextureType::Palette4bpp; - else if (str == "ci8") - texType = TextureType::Palette8bpp; - else - // TODO: handle this case in a more coherent way - HANDLE_WARNING(WarningType::InvalidAttributeValue, - "invalid value found for 'Type' attribute", "Defaulting to ''."); - return texType; -} - -bool ZTexture::IsColorIndexed() const -{ - switch (format) - { - case TextureType::Palette4bpp: - case TextureType::Palette8bpp: - return true; - - default: - return false; - } -} - -void ZTexture::SetTlut(ZTexture* nTlut) -{ - assert(IsColorIndexed()); - assert(nTlut->isPalette); - tlut = nTlut; - - textureData.SetPalette(tlut->textureData, splitTlut ? 128 : 0); -} - -bool ZTexture::HasTlut() const -{ - return tlut != nullptr; -} diff --git a/ZAPDTR/ZAPD/ZTexture.h b/ZAPDTR/ZAPD/ZTexture.h deleted file mode 100644 index 8cece3ff2..000000000 --- a/ZAPDTR/ZAPD/ZTexture.h +++ /dev/null @@ -1,93 +0,0 @@ -#pragma once - -#include "ImageBackend.h" -#include "ZResource.h" -#include "tinyxml2.h" - -enum class TextureType -{ - Error, - RGBA32bpp, - RGBA16bpp, - Palette4bpp, - Palette8bpp, - Grayscale4bpp, - Grayscale8bpp, - GrayscaleAlpha4bpp, - GrayscaleAlpha8bpp, - GrayscaleAlpha16bpp, -}; - -class ZTexture : public ZResource -{ -protected: - TextureType format = TextureType::Error; - uint32_t width, height; - - ImageBackend textureData; - std::vector textureDataRaw; // When reading from a PNG file. - uint32_t tlutOffset = static_cast(-1); - ZTexture* tlut = nullptr; - bool splitTlut; - - void PrepareBitmapRGBA16(); - void PrepareBitmapRGBA32(); - void PrepareBitmapGrayscale8(); - void PrepareBitmapGrayscaleAlpha8(); - void PrepareBitmapGrayscale4(); - void PrepareBitmapGrayscaleAlpha4(); - void PrepareBitmapGrayscaleAlpha16(); - void PrepareBitmapPalette4(); - void PrepareBitmapPalette8(); - - void PrepareRawDataFromFile(const fs::path& inFolder); - void PrepareRawDataRGBA16(); - void PrepareRawDataRGBA32(); - void PrepareRawDataGrayscale4(); - void PrepareRawDataGrayscale8(); - void PrepareRawDataGrayscaleAlpha4(); - void PrepareRawDataGrayscaleAlpha8(); - void PrepareRawDataGrayscaleAlpha16(); - void PrepareRawDataPalette4(); - void PrepareRawDataPalette8(); - -public: - ZTexture(ZFile* nParent); - - bool isPalette = false; - bool dWordAligned = true; - - void ExtractFromBinary(uint32_t nRawDataIndex, int32_t nWidth, int32_t nHeight, - TextureType nType, bool nIsPalette); - void FromPNG(const fs::path& pngFilePath, TextureType texType); - static TextureType GetTextureTypeFromString(const std::string& str); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - void CalcHash() override; - void Save(const fs::path& outFolder) override; - - bool IsExternalResource() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - std::string GetExternalExtension() const override; - - size_t GetRawDataSize() const override; - std::string GetIMFmtFromType(); - std::string GetIMSizFromType(); - std::string GetDefaultName(const std::string& prefix) const override; - uint32_t GetWidth() const; - uint32_t GetHeight() const; - void SetDimensions(uint32_t nWidth, uint32_t nHeight); - float GetPixelMultiplyer() const; - TextureType GetTextureType() const; - fs::path GetPoolOutPath(const fs::path& defaultValue); - bool IsColorIndexed() const; - void SetTlut(ZTexture* nTlut); - bool HasTlut() const; - void ParseRawDataLate() override; -}; diff --git a/ZAPDTR/ZAPD/ZTextureAnimation.cpp b/ZAPDTR/ZAPD/ZTextureAnimation.cpp deleted file mode 100644 index 233a54dbb..000000000 --- a/ZAPDTR/ZAPD/ZTextureAnimation.cpp +++ /dev/null @@ -1,670 +0,0 @@ -/** - * File: ZTextureAnimation.cpp - * ZResources defined: ZTextureAnimation, ZTextureAnimationParams (XML declaration not supported for - * the latter) - * Purpose: extracting texture animating structures from asset files - * Note: data type is exclusive to Majora's Mask - * - * Structure of data: - * A texture animation consists of a main array of data of the form - * `SS 00 00 0T PPPPPPPP`, - * where `S` is the segment that the functionality is sent to (and read by DLists), `T` is the - * "type" (see below), and `P` is a pointer to the type's subsidiary information, which is - * invariably just above this main array. Details of this subsidiary data are given below. - * - * Segment - * === - * The segment starts at 1 and is incremented in each entry; the final one is negated, which is used - * as the indication to stop reading. The actual segment the game will use to draw is S + 7. - * - * Types - * === - * There are 7 values that `T` can take: - * `0`: A single texture scroll (Implemented by Gfx_TexScroll): subsidiary params are given as - * an array with one entry, a struct `XX YY WW HH` containing xStep, yStep, width, height - * (all u8). - * - * `1`: A dual texture scroll (Implementated by Gfx_TwoTexScroll): same as type `0`, but with - * two entries in the params array. - * - * `2`: Color changing: Changes the primColor (with a LOD factor) and envColor - * `KKKK LLLL PPPPPPPP QQQQQQQQ RRRRRRRR` - * - `K` (u16) is the total length of the animation (and in this case, the total number of - * colors) - * - `L` (u16) is seemingly always 0 for this type, and not used in the code - * - `P` segmented pointer to array of augmented primColors - * - `Q` segmented pointer to array of envColors, and can be NULL - * - `R` segmented pointer to array of frameData (u8), which is also seemingly always NULL - * for this type. - * - * envColors take the form `RR GG BB AA` as usual, while primColors have an extra LODFrac - * element: RR GG BB AA LL - * - * `3`: Color changing (LERP): similar to type `2`, but uses linear interpolation. The structure - * is similar to `2`, but - * - `K` is now just the animation length, while - * - `L` is the total number of colors, and - * - the frameData is used to determine which colors to interpolate. - * - * `4`: Color changing (Lagrange interpolation): For extraction purposes identical to type 3. - * Uses a nonlinear interpolation formula to change the colours more smoothly. - * - * `5`: Texture cycle: functions like a gif. Subsidiary params: - * `FFFF 0000 PPPPPPPP QQQQQQQQ` - * where - * - `F` (u16) time between changes in frames - * - `P` pointer to array of segmented pointers to textures to cycle through - * - `Q` array of indices, indicating which texture to use next when a change frame is - * reached. The maximum indicates the number of textures in the texture array. - * - * `6`: This is used to indicate an empty/unimplemented params set. It is ignored by the game's - * function provided that the segment is 0. A generic empty one takes the form - * `00 00 00 06 00000000`, - * and has no extra data. - * - * Implementation - * === - * - ZTextureAnimation requires a declaration in the XML to extract anything. It handles the main - * array. It uses a POD struct for each entry, and declares references to the params structs. - * - * - ZTextureAnimationParams is not (currently) declarable in an XML. It is a parent class for the - * three classes that handle the various cases: - * - TextureScrollingParams for types `0` and `1` - * - TextureColorChangingParams for types `2`,`3`,`4` - * - TextureCyclingParams for type `5` - * Each of these will declare all its subsidiary arrays, using POD structs. - */ -#include "ZTextureAnimation.h" - -#include -#include -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include "WarningHandler.h" -#include "ZFile.h" -#include "ZResource.h" -#include "tinyxml2.h" - -REGISTER_ZFILENODE(TextureAnimation, ZTextureAnimation); - -/* Constructors */ -ZTextureAnimationParams::ZTextureAnimationParams(ZFile* parent) : ZResource::ZResource(parent) -{ -} -TextureScrollingParams::TextureScrollingParams(ZFile* parent) - : ZTextureAnimationParams::ZTextureAnimationParams(parent) -{ -} -TextureColorChangingParams::TextureColorChangingParams(ZFile* parent) - : ZTextureAnimationParams::ZTextureAnimationParams(parent) -{ -} -TextureCyclingParams::TextureCyclingParams(ZFile* parent) - : ZTextureAnimationParams::ZTextureAnimationParams(parent) -{ -} - -/* TextureAnimationParams */ -/* This class only implements the functions common to all or most its inheritors */ - -void ZTextureAnimationParams::ExtractFromBinary(uint32_t nRawDataIndex) -{ - rawDataIndex = nRawDataIndex; - - ParseRawData(); -} - -// Implemented by TextureScrollingParams only -void ZTextureAnimationParams::ExtractFromBinary([[maybe_unused]] uint32_t nRawDataIndex, - [[maybe_unused]] int count) -{ -} - -std::string -ZTextureAnimationParams::GetDefaultName([[maybe_unused]] const std::string& prefix) const -{ - return "ShouldNotBeVIsible"; -} - -ZResourceType ZTextureAnimationParams::GetResourceType() const -{ - return ZResourceType::TextureAnimationParams; -} - -/* TextureScrollingParams */ - -void TextureScrollingParams::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - for (int i = 0; i < count; i++) - { - rows[i].xStep = BitConverter::ToUInt8BE(rawData, rawDataIndex + 4 * i); - rows[i].yStep = BitConverter::ToUInt8BE(rawData, rawDataIndex + 4 * i + 1); - rows[i].width = BitConverter::ToUInt8BE(rawData, rawDataIndex + 4 * i + 2); - rows[i].height = BitConverter::ToUInt8BE(rawData, rawDataIndex + 4 * i + 3); - } -} - -void TextureScrollingParams::ExtractFromBinary(uint32_t nRawDataIndex, int nCount) -{ - rawDataIndex = nRawDataIndex; - count = nCount; - - ParseRawData(); -} - -std::string TextureScrollingParams::GetSourceTypeName() const -{ - return "AnimatedMatTexScrollParams"; // TODO: Better name -} - -std::string TextureScrollingParams::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sTexScrollParams_%06X", prefix.c_str(), rawDataIndex); -} - -size_t TextureScrollingParams::GetRawDataSize() const -{ - return 4 * count; -} - -/** - * Overrides the parent version to declare an array of the params rather than just one entry. - */ -Declaration* TextureScrollingParams::DeclareVar(const std::string& prefix, - const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - return parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, count, bodyStr); -} - -std::string TextureScrollingParams::GetBodySourceCode() const -{ - std::string bodyStr; - - for (int i = 0; i < count; i++) - { - bodyStr += StringHelper::Sprintf("\t{ %d, %d, 0x%02X, 0x%02X },\n", rows[i].xStep, - rows[i].yStep, rows[i].width, rows[i].height); - } - - bodyStr.pop_back(); - - return bodyStr; -} - -/* TextureColorChangingParams */ - -/** - * Also parses the color and frameData arrays - */ -void TextureColorChangingParams::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - animLength = BitConverter::ToUInt16BE(rawData, rawDataIndex); - colorListCount = BitConverter::ToUInt16BE(rawData, rawDataIndex + 2); - - // Handle type 2 separately - uint16_t listLength = - ((type == TextureAnimationParamsType::ColorChange) ? animLength : colorListCount); - - if (listLength == 0) - HANDLE_ERROR_RESOURCE(WarningType::Always, parent, this, rawDataIndex, - "color list length cannot be 0", ""); - - primColorListAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); - envColorListAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - frameDataListAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex + 0xC); - - uint32_t primColorListOffset = Seg2Filespace(primColorListAddress, parent->baseAddress); - uint32_t envColorListOffset = Seg2Filespace(envColorListAddress, parent->baseAddress); - uint32_t frameDataListOffset = Seg2Filespace(frameDataListAddress, parent->baseAddress); - - uint32_t currentPtr; - - F3DPrimColor currentPrimColor; - - for (currentPtr = primColorListOffset; currentPtr < primColorListOffset + 5 * listLength; - currentPtr += 5) - { - currentPrimColor = {BitConverter::ToUInt8BE(rawData, currentPtr), - BitConverter::ToUInt8BE(rawData, currentPtr + 1), - BitConverter::ToUInt8BE(rawData, currentPtr + 2), - BitConverter::ToUInt8BE(rawData, currentPtr + 3), - BitConverter::ToUInt8BE(rawData, currentPtr + 4)}; - primColorList.push_back(currentPrimColor); - } - - F3DEnvColor currentEnvColor; - - for (currentPtr = envColorListOffset; currentPtr < envColorListOffset + 4 * listLength; - currentPtr += 4) - { - currentEnvColor = {BitConverter::ToUInt8BE(rawData, currentPtr), - BitConverter::ToUInt8BE(rawData, currentPtr + 1), - BitConverter::ToUInt8BE(rawData, currentPtr + 2), - BitConverter::ToUInt8BE(rawData, currentPtr + 3)}; - envColorList.push_back(currentEnvColor); - } - - uint16_t currentFrameData; - - for (currentPtr = frameDataListOffset; currentPtr < frameDataListOffset + 2 * listLength; - currentPtr += 2) - { - currentFrameData = BitConverter::ToUInt16BE(rawData, currentPtr); - frameDataList.push_back(currentFrameData); - } -} - -std::string TextureColorChangingParams::GetSourceTypeName() const -{ - return "AnimatedMatColorParams"; // TODO: Better name -} - -std::string TextureColorChangingParams::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sColorParams_%06X", prefix.c_str(), rawDataIndex); -} - -size_t TextureColorChangingParams::GetRawDataSize() const -{ - return 0x10; -} - -void TextureColorChangingParams::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (primColorListAddress != 0) // NULL - { - std::string primColorBodyStr; - - for (const auto& color : primColorList) - { - primColorBodyStr += StringHelper::Sprintf("\t{ %d, %d, %d, %d, %d },\n", color.r, - color.g, color.b, color.a, color.lodFrac); - } - - primColorBodyStr.pop_back(); - - parent->AddDeclarationArray( - Seg2Filespace(primColorListAddress, parent->baseAddress), DeclarationAlignment::Align4, - primColorList.size() * 5, "F3DPrimColor", - StringHelper::Sprintf("%sTexColorChangingPrimColors_%06X", parent->GetName().c_str(), - Seg2Filespace(primColorListAddress, parent->baseAddress)), - primColorList.size(), primColorBodyStr); - } - - if (envColorListAddress != 0) // NULL - { - std::string envColorBodyStr; - - for (const auto& color : envColorList) - { - envColorBodyStr += StringHelper::Sprintf("\t{ %d, %d, %d, %d },\n", color.r, color.g, - color.b, color.a); - } - - envColorBodyStr.pop_back(); - - parent->AddDeclarationArray( - Seg2Filespace(envColorListAddress, parent->baseAddress), DeclarationAlignment::Align4, - envColorList.size() * 4, "F3DEnvColor", - StringHelper::Sprintf("%sTexColorChangingEnvColors_%06X", parent->GetName().c_str(), - Seg2Filespace(envColorListAddress, parent->baseAddress)), - envColorList.size(), envColorBodyStr); - } - - if (frameDataListAddress != 0) // NULL - { - std::string frameDataBodyStr = "\t"; - - for (const auto& frame : frameDataList) - { - frameDataBodyStr += StringHelper::Sprintf("%d, ", frame); - } - - frameDataBodyStr.pop_back(); - - parent->AddDeclarationArray( - Seg2Filespace(frameDataListAddress, parent->baseAddress), DeclarationAlignment::Align4, - frameDataList.size() * 2, "u16", - StringHelper::Sprintf("%sTexColorChangingFrameData_%06X", parent->GetName().c_str(), - Seg2Filespace(frameDataListAddress, parent->baseAddress)), - frameDataList.size(), frameDataBodyStr); - } -} - -std::string TextureColorChangingParams::GetBodySourceCode() const -{ - std::string primColorListName; - std::string envColorListName; - std::string frameDataListName; - - Globals::Instance->GetSegmentedPtrName(primColorListAddress, parent, "", primColorListName, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(envColorListAddress, parent, "", envColorListName, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(frameDataListAddress, parent, "", frameDataListName, - parent->workerID); - - std::string bodyStr = StringHelper::Sprintf( - "\n %d, %d, %s, %s, %s,\n", animLength, colorListCount, primColorListName.c_str(), - envColorListName.c_str(), frameDataListName.c_str()); - - return bodyStr; -} - -/* TextureCyclingParams */ - -void TextureCyclingParams::ParseRawData() -{ - const auto& rawData = parent->GetRawData(); - - cycleLength = BitConverter::ToUInt16BE(rawData, rawDataIndex); - if (cycleLength == 0) - HANDLE_ERROR_RESOURCE(WarningType::Always, parent, this, rawDataIndex, - "cycle length cannot be 0", ""); - - textureListAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex + 4); - textureIndexListAddress = BitConverter::ToUInt32BE(rawData, rawDataIndex + 8); - - uint32_t textureListOffset = Seg2Filespace(textureListAddress, parent->baseAddress); - uint32_t textureIndexListOffset = Seg2Filespace(textureIndexListAddress, parent->baseAddress); - - uint32_t currentPtr; - - uint8_t currentIndex; - uint8_t maxIndex = 0; // To find the length of the texture list - - for (currentPtr = textureIndexListOffset; currentPtr < textureIndexListOffset + cycleLength; - currentPtr++) - { - currentIndex = BitConverter::ToUInt8BE(rawData, currentPtr); - textureIndexList.push_back(currentIndex); - if (currentIndex > maxIndex) - maxIndex = currentIndex; - } - - for (currentPtr = textureListOffset; currentPtr <= textureListOffset + 4 * maxIndex; - currentPtr += 4) - { - textureList.push_back(BitConverter::ToUInt32BE(rawData, currentPtr)); - } -} - -std::string TextureCyclingParams::GetSourceTypeName() const -{ - return "AnimatedMatTexCycleParams"; // TODO: Better name -} - -std::string TextureCyclingParams::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sTexCycleParams_%06X", prefix.c_str(), rawDataIndex); -} - -size_t TextureCyclingParams::GetRawDataSize() const -{ - return 0xC; -} - -void TextureCyclingParams::DeclareReferences([[maybe_unused]] const std::string& prefix) -{ - if (textureListAddress != 0) // NULL - { - std::string texturesBodyStr; - std::string texName; - std::string comment; - - for (const auto& tex : textureList) - { - bool texFound = - Globals::Instance->GetSegmentedPtrName(tex, parent, "", texName, parent->workerID); - - // texName is a raw segmented pointer. This occurs if the texture is not declared - // separately since we cannot read the format. In theory we could scan DLists for the - // format on the appropriate segments. - if (!texFound) - { - comment = " // Raw pointer, declare texture in XML to use proper symbol"; - - auto msgHeader = StringHelper::Sprintf( - "TexCycle texture array declared here points to unknown texture at address %s", - texName.c_str()); - HANDLE_WARNING_RESOURCE( - WarningType::HardcodedPointer, parent, this, rawDataIndex, msgHeader, - "Please declare the texture in the XML to use the proper symbol."); - } - texturesBodyStr += StringHelper::Sprintf("\t%s,%s\n", texName.c_str(), comment.c_str()); - } - - texturesBodyStr.pop_back(); - - parent->AddDeclarationArray( - Seg2Filespace(textureListAddress, parent->baseAddress), DeclarationAlignment::Align4, - textureList.size() * 4, "TexturePtr", - StringHelper::Sprintf("%sTexCycleTexPtrs_%06X", parent->GetName().c_str(), - Seg2Filespace(textureListAddress, parent->baseAddress)), - textureList.size(), texturesBodyStr); - } - - if (textureIndexListAddress != 0) // NULL - { - std::string indicesBodyStr = "\t"; - - for (uint8_t index : textureIndexList) - { - indicesBodyStr += StringHelper::Sprintf("%d, ", index); - } - - indicesBodyStr.pop_back(); - - parent->AddDeclarationArray( - Seg2Filespace(textureIndexListAddress, parent->baseAddress), - DeclarationAlignment::Align4, textureIndexList.size(), "u8", - StringHelper::Sprintf("%sTexCycleTexIndices_%06X", parent->GetName().c_str(), - Seg2Filespace(textureIndexListAddress, parent->baseAddress)), - textureIndexList.size(), indicesBodyStr); - } -} - -std::string TextureCyclingParams::GetBodySourceCode() const -{ - std::string textureListName; - std::string textureIndexListName; - - Globals::Instance->GetSegmentedPtrName(textureListAddress, parent, "", textureListName, - parent->workerID); - Globals::Instance->GetSegmentedPtrName(textureIndexListAddress, parent, "", - textureIndexListName, parent->workerID); - - std::string bodyStr = StringHelper::Sprintf( - "\n %d, %s, %s,\n", cycleLength, textureListName.c_str(), textureIndexListName.c_str()); - - return bodyStr; -} - -/* ZTextureAnimation */ - -ZTextureAnimation::ZTextureAnimation(ZFile* nParent) : ZResource(nParent) -{ -} - -/** - * Builds the array of params - */ -void ZTextureAnimation::ParseRawData() -{ - ZResource::ParseRawData(); - - TextureAnimationEntry currentEntry; - auto rawData = parent->GetRawData(); - int16_t type; - - for (uint32_t currentPtr = rawDataIndex;; currentPtr += 8) - { - type = BitConverter::ToInt16BE(rawData, currentPtr + 2); - - currentEntry.segment = BitConverter::ToInt8BE(rawData, currentPtr); - currentEntry.type = (TextureAnimationParamsType)type; - currentEntry.paramsPtr = BitConverter::ToUInt32BE(rawData, currentPtr + 4); - entries.push_back(currentEntry); - - if ((type < 0) || (type > 6)) - { - HANDLE_ERROR_RESOURCE( - WarningType::Always, parent, this, rawDataIndex, - StringHelper::Sprintf( - "unknown TextureAnimationParams type 0x%02X in TextureAnimation", type), - StringHelper::Sprintf( - "Entry reads { 0x%02X, 0x%02X, 0x%08X } , but type should be " - "between 0x00 and 0x06 inclusive.", - currentEntry.segment, type, currentEntry.paramsPtr)); - } - - if (currentEntry.segment <= 0) - break; - } -} - -#include -/** - * For each params entry, - */ -void ZTextureAnimation::DeclareReferences(const std::string& prefix) -{ - std::string varPrefix = name; - if (varPrefix == "") - varPrefix = prefix; - - ZResource::DeclareReferences(varPrefix); - - for (const auto& entry : entries) - { - if (entry.paramsPtr != 0 && GETSEGNUM(entry.paramsPtr) == parent->segment) - { - uint32_t paramsOffset = Seg2Filespace(entry.paramsPtr, parent->baseAddress); - if (!parent->HasDeclaration(paramsOffset)) - { - ZTextureAnimationParams* params; - int count; - switch (entry.type) - { - case TextureAnimationParamsType::SingleScroll: - if (true) - { - count = 1; - // The else now allows SingleScroll to fall through to params = ... without - // touching the code in the else block - } - else - { - // The contents of this block can only be run by jumping into it with the - // case label - [[fallthrough]]; - case TextureAnimationParamsType::DualScroll: - count = 2; - } - params = new TextureScrollingParams(parent); - params->ExtractFromBinary(paramsOffset, count); - break; - - case TextureAnimationParamsType::ColorChange: - case TextureAnimationParamsType::ColorChangeLERP: - case TextureAnimationParamsType::ColorChangeLagrange: - params = new TextureColorChangingParams(parent); - params->type = entry.type; - params->ExtractFromBinary(paramsOffset); - break; - - case TextureAnimationParamsType::TextureCycle: - params = new TextureCyclingParams(parent); - params->ExtractFromBinary(paramsOffset); - break; - - case TextureAnimationParamsType::Empty: - HANDLE_WARNING_RESOURCE( - WarningType::InvalidExtractedData, parent, this, rawDataIndex, - "TextureAnimationParams entry has empty type (6), but params pointer is " - "not NULL", - StringHelper::Sprintf("Params read { 0x%02X, 0x%02X, 0x%08X } .", - entry.segment, (int)entry.type, entry.paramsPtr)); - return; - default: - // Because GCC is worried this could happen - assert(entry.type < TextureAnimationParamsType::SingleScroll || - entry.type > TextureAnimationParamsType::Empty); - return; - } - - params->SetName(params->GetDefaultName(varPrefix)); - params->DeclareVar(varPrefix, ""); - parent->AddResource(params); - } - } - } -} - -std::string ZTextureAnimation::GetSourceTypeName() const -{ - return "AnimatedMaterial"; // TODO: Better name -} - -ZResourceType ZTextureAnimation::GetResourceType() const -{ - return ZResourceType::TextureAnimation; -} - -/** - * The size of the main array - */ -size_t ZTextureAnimation::GetRawDataSize() const -{ - return entries.size() * 8; -} - -std::string ZTextureAnimation::GetDefaultName(const std::string& prefix) const -{ - return StringHelper::Sprintf("%sTexAnim_%06X", prefix.c_str(), rawDataIndex); -} - -Declaration* ZTextureAnimation::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - std::string auxName = name; - - if (name == "") - auxName = GetDefaultName(prefix); - - Declaration* decl = - parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(), - GetSourceTypeName(), auxName, entries.size(), bodyStr); - decl->staticConf = staticConf; - return decl; -} - -std::string ZTextureAnimation::GetBodySourceCode() const -{ - std::string bodyStr; - - for (const auto& entry : entries) - { - std::string paramName; - Globals::Instance->GetSegmentedPtrName(entry.paramsPtr, parent, "", paramName, - parent->workerID); - - bodyStr += StringHelper::Sprintf("\t{ %d, %d, %s },\n", entry.segment, entry.type, - paramName.c_str()); - } - - bodyStr.pop_back(); - - return bodyStr; -} diff --git a/ZAPDTR/ZAPD/ZTextureAnimation.h b/ZAPDTR/ZAPD/ZTextureAnimation.h deleted file mode 100644 index 6b03eb7cf..000000000 --- a/ZAPDTR/ZAPD/ZTextureAnimation.h +++ /dev/null @@ -1,151 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -#include "ZResource.h" - -enum class TextureAnimationParamsType -{ - /* 0 */ SingleScroll, - /* 1 */ DualScroll, - /* 2 */ ColorChange, - /* 3 */ ColorChangeLERP, - /* 4 */ ColorChangeLagrange, - /* 5 */ TextureCycle, - /* 6 */ Empty // An empty TextureAnimation has the form 00 00 00 06 00000000 -}; - -class ZTextureAnimationParams : public ZResource -{ -public: - ZTextureAnimationParams(ZFile* parent); - - void ExtractFromBinary(uint32_t nRawDataIndex); - virtual void ExtractFromBinary(uint32_t nRawDataIndex, int count); - - virtual std::string GetDefaultName(const std::string& prefix) const; - ZResourceType GetResourceType() const; - - TextureAnimationParamsType type; -}; - -struct TextureScrollingParamsEntry -{ - int8_t xStep; - int8_t yStep; - uint8_t width; - uint8_t height; -}; - -class TextureScrollingParams : public ZTextureAnimationParams -{ -public: - TextureScrollingParams(ZFile* parent); - - void ParseRawData() override; - void ExtractFromBinary(uint32_t nRawDataIndex, int count) override; - - std::string GetSourceTypeName() const override; - std::string GetDefaultName(const std::string& prefix) const override; - size_t GetRawDataSize() const override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - int count; // 1 for Single, 2 for Dual - TextureScrollingParamsEntry rows[2]; // Too small to make a vector worth it -}; - -struct F3DPrimColor -{ - uint8_t r; - uint8_t g; - uint8_t b; - uint8_t a; - uint8_t lodFrac; -}; - -struct F3DEnvColor -{ - uint8_t r; - uint8_t g; - uint8_t b; - uint8_t a; -}; - -class TextureColorChangingParams : public ZTextureAnimationParams -{ -public: - TextureColorChangingParams(ZFile* parent); - - void ParseRawData() override; - - std::string GetSourceTypeName() const override; - std::string GetDefaultName(const std::string& prefix) const override; - size_t GetRawDataSize() const override; - - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - uint16_t animLength; // size of list for type 2 - uint16_t colorListCount; - segptr_t primColorListAddress; - segptr_t envColorListAddress; - segptr_t frameDataListAddress; - std::vector primColorList; - std::vector envColorList; - std::vector frameDataList; -}; - -class TextureCyclingParams : public ZTextureAnimationParams -{ -public: - TextureCyclingParams(ZFile* parent); - - void ParseRawData() override; - - std::string GetSourceTypeName() const override; - std::string GetDefaultName(const std::string& prefix) const override; - size_t GetRawDataSize() const override; - - void DeclareReferences(const std::string& prefix) override; - - std::string GetBodySourceCode() const override; - - uint16_t cycleLength; - segptr_t textureListAddress; - segptr_t textureIndexListAddress; - std::vector textureList; - std::vector textureIndexList; -}; - -struct TextureAnimationEntry -{ - int8_t segment; - TextureAnimationParamsType type; - segptr_t paramsPtr; -}; - -class ZTextureAnimation : public ZResource -{ -public: - ZTextureAnimation(ZFile* nParent); - - void ParseRawData() override; - void DeclareReferences(const std::string& prefix) override; - - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - size_t GetRawDataSize() const override; - std::string GetDefaultName(const std::string& prefix) const override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - -private: - std::vector entries; -}; diff --git a/ZAPDTR/ZAPD/ZVector.cpp b/ZAPDTR/ZAPD/ZVector.cpp deleted file mode 100644 index 092b876d2..000000000 --- a/ZAPDTR/ZAPD/ZVector.cpp +++ /dev/null @@ -1,126 +0,0 @@ -#include "ZVector.h" - -#include - -#include "Globals.h" -#include "Utils/BitConverter.h" -#include -#include "Utils/StringHelper.h" -#include "WarningHandler.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Vector, ZVector); - -ZVector::ZVector(ZFile* nParent) : ZResource(nParent) -{ - scalarType = ZScalarType::ZSCALAR_NONE; - dimensions = 0; - - RegisterRequiredAttribute("Type"); - RegisterRequiredAttribute("Dimensions"); -} - -void ZVector::ExtractFromBinary(uint32_t nRawDataIndex, ZScalarType nScalarType, - uint32_t nDimensions) -{ - rawDataIndex = nRawDataIndex; - scalarType = nScalarType; - dimensions = nDimensions; - - // Don't parse raw data of external files - if (parent->GetMode() == ZFileMode::ExternalFile) - return; - - ParseRawData(); -} - -void ZVector::ParseXML(tinyxml2::XMLElement* reader) -{ - ZResource::ParseXML(reader); - - this->scalarType = ZScalar::MapOutputTypeToScalarType(registeredAttributes.at("Type").value); - - this->dimensions = StringHelper::StrToL(registeredAttributes.at("Dimensions").value, 16); -} - -void ZVector::ParseRawData() -{ - int32_t currentRawDataIndex = rawDataIndex; - // TODO: this shouldn't be necessary. - scalars.clear(); - scalars.reserve(dimensions); - for (uint32_t i = 0; i < dimensions; i++) - { - ZScalar scalar(parent); - scalar.ExtractFromBinary(currentRawDataIndex, scalarType); - currentRawDataIndex += scalar.GetRawDataSize(); - - scalars.push_back(scalar); - } - - // Ensure the scalars vector has the same number of elements as the vector dimension. - assert(scalars.size() == dimensions); -} - -size_t ZVector::GetRawDataSize() const -{ - size_t size = 0; - - for (size_t i = 0; i < this->scalars.size(); i++) - size += this->scalars[i].GetRawDataSize(); - - return size; -} - -bool ZVector::DoesSupportArray() const -{ - return true; -} - -std::string ZVector::GetSourceTypeName() const -{ - if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_F32) - return "Vec3f"; - else if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_S16) - return "Vec3s"; - else if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_S32) - return "Vec3i"; - else - { - std::string msgHeader = StringHelper::Sprintf( - "encountered unsupported vector type: %d dimensions, %s type", dimensions, - ZScalar::MapScalarTypeToOutputType(scalarType).c_str()); - - HANDLE_ERROR_RESOURCE(WarningType::NotImplemented, parent, this, rawDataIndex, msgHeader, - ""); - } -} - -std::string ZVector::GetBodySourceCode() const -{ - std::string body = ""; - - for (size_t i = 0; i < scalars.size(); i++) - { - body += StringHelper::Sprintf("%6s", scalars[i].GetBodySourceCode().c_str()); - - if (i + 1 < scalars.size()) - body += ", "; - } - - return body; -} - -ZResourceType ZVector::GetResourceType() const -{ - return ZResourceType::Vector; -} - -DeclarationAlignment ZVector::GetDeclarationAlignment() const -{ - if (scalars.size() == 0) - { - return DeclarationAlignment::Align4; - } - return scalars.at(0).GetDeclarationAlignment(); -} diff --git a/ZAPDTR/ZAPD/ZVector.h b/ZAPDTR/ZAPD/ZVector.h deleted file mode 100644 index a50d3e808..000000000 --- a/ZAPDTR/ZAPD/ZVector.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include -#include -#include -#include "ZResource.h" -#include "ZScalar.h" -#include "tinyxml2.h" - -class ZVector : public ZResource -{ -public: - std::vector scalars; - ZScalarType scalarType; - uint32_t dimensions; - - ZVector(ZFile* nParent); - - void ExtractFromBinary(uint32_t nRawDataIndex, ZScalarType nScalarType, uint32_t nDimensions); - - void ParseXML(tinyxml2::XMLElement* reader) override; - void ParseRawData() override; - - std::string GetBodySourceCode() const override; - - bool DoesSupportArray() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; -}; diff --git a/ZAPDTR/ZAPD/ZVtx.cpp b/ZAPDTR/ZAPD/ZVtx.cpp deleted file mode 100644 index e4b3d9796..000000000 --- a/ZAPDTR/ZAPD/ZVtx.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include "ZVtx.h" - -#include "Utils/BitConverter.h" -#include "Utils/StringHelper.h" -#include "ZFile.h" - -REGISTER_ZFILENODE(Vtx, ZVtx); - -ZVtx::ZVtx(ZFile* nParent) : ZResource(nParent) -{ - x = 0; - y = 0; - z = 0; - flag = 0; - s = 0; - t = 0; - r = 0; - g = 0; - b = 0; - a = 0; -} - -void ZVtx::ParseRawData() -{ - ZResource::ParseRawData(); - - const auto& rawData = parent->GetRawData(); - x = BitConverter::ToInt16BE(rawData, rawDataIndex + 0); - y = BitConverter::ToInt16BE(rawData, rawDataIndex + 2); - z = BitConverter::ToInt16BE(rawData, rawDataIndex + 4); - flag = BitConverter::ToInt16BE(rawData, rawDataIndex + 6); - s = BitConverter::ToInt16BE(rawData, rawDataIndex + 8); - t = BitConverter::ToInt16BE(rawData, rawDataIndex + 10); - r = rawData[rawDataIndex + 12]; - g = rawData[rawDataIndex + 13]; - b = rawData[rawDataIndex + 14]; - a = rawData[rawDataIndex + 15]; -} - -Declaration* ZVtx::DeclareVar(const std::string& prefix, const std::string& bodyStr) -{ - Declaration* decl = ZResource::DeclareVar(prefix, bodyStr); - decl->isExternal = true; - return decl; -} - -std::string ZVtx::GetBodySourceCode() const -{ - return StringHelper::Sprintf("VTX(%i, %i, %i, %i, %i, %i, %i, %i, %i)", x, y, z, s, t, r, g, b, - a); -} - -size_t ZVtx::GetRawDataSize() const -{ - return 16; -} - -bool ZVtx::DoesSupportArray() const -{ - return true; -} - -ZResourceType ZVtx::GetResourceType() const -{ - return ZResourceType::Vertex; -} - -bool ZVtx::IsExternalResource() const -{ - return true; -} - -std::string ZVtx::GetSourceTypeName() const -{ - return "Vtx"; -} - -std::string ZVtx::GetExternalExtension() const -{ - return "vtx"; -} - -DeclarationAlignment ZVtx::GetDeclarationAlignment() const -{ - return DeclarationAlignment::Align8; -} diff --git a/ZAPDTR/ZAPD/ZVtx.h b/ZAPDTR/ZAPD/ZVtx.h deleted file mode 100644 index 511048791..000000000 --- a/ZAPDTR/ZAPD/ZVtx.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include -#include -#include -#include "ZResource.h" -#include "ZScalar.h" -#include "tinyxml2.h" - -class ZVtx : public ZResource -{ -public: - int16_t x, y, z; - uint16_t flag; - int16_t s, t; - uint8_t r, g, b, a; - - ZVtx(ZFile* nParent); - - void ParseRawData() override; - - Declaration* DeclareVar(const std::string& prefix, const std::string& bodyStr) override; - std::string GetBodySourceCode() const override; - - bool IsExternalResource() const override; - bool DoesSupportArray() const override; - std::string GetSourceTypeName() const override; - ZResourceType GetResourceType() const override; - std::string GetExternalExtension() const override; - - size_t GetRawDataSize() const override; - DeclarationAlignment GetDeclarationAlignment() const override; -}; diff --git a/ZAPDTR/ZAPD/any/any/zlib.static.txt b/ZAPDTR/ZAPD/any/any/zlib.static.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/ZAPDTR/ZAPD/ctpl_stl.h b/ZAPDTR/ZAPD/ctpl_stl.h deleted file mode 100644 index 8e2d9c908..000000000 --- a/ZAPDTR/ZAPD/ctpl_stl.h +++ /dev/null @@ -1,251 +0,0 @@ -/********************************************************* -* -* Copyright (C) 2014 by Vitaliy Vitsentiy -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -*********************************************************/ - - -#ifndef __ctpl_stl_thread_pool_H__ -#define __ctpl_stl_thread_pool_H__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - - -// thread pool to run user's functors with signature -// ret func(int id, other_params) -// where id is the index of the thread that runs the functor -// ret is some return type - - -namespace ctpl { - - namespace detail { - template - class Queue { - public: - bool push(T const & value) { - std::unique_lock lock(this->mutex); - this->q.push(value); - return true; - } - // deletes the retrieved element, do not use for non integral types - bool pop(T & v) { - std::unique_lock lock(this->mutex); - if (this->q.empty()) - return false; - v = this->q.front(); - this->q.pop(); - return true; - } - bool empty() { - std::unique_lock lock(this->mutex); - return this->q.empty(); - } - private: - std::queue q; - std::mutex mutex; - }; - } - - class thread_pool { - - public: - - thread_pool() { this->init(); } - thread_pool(int nThreads) { this->init(); this->resize(nThreads); } - - // the destructor waits for all the functions in the queue to be finished - ~thread_pool() { - this->stop(true); - } - - // get the number of running threads in the pool - int size() { return static_cast(this->threads.size()); } - - // number of idle threads - int n_idle() { return this->nWaiting; } - std::thread & get_thread(int i) { return *this->threads[i]; } - - // change the number of threads in the pool - // should be called from one thread, otherwise be careful to not interleave, also with this->stop() - // nThreads must be >= 0 - void resize(int nThreads) { - if (!this->isStop && !this->isDone) { - int oldNThreads = static_cast(this->threads.size()); - if (oldNThreads <= nThreads) { // if the number of threads is increased - this->threads.resize(nThreads); - this->flags.resize(nThreads); - - for (int i = oldNThreads; i < nThreads; ++i) { - this->flags[i] = std::make_shared>(false); - this->set_thread(i); - } - } - else { // the number of threads is decreased - for (int i = oldNThreads - 1; i >= nThreads; --i) { - *this->flags[i] = true; // this thread will finish - this->threads[i]->detach(); - } - { - // stop the detached threads that were waiting - std::unique_lock lock(this->mutex); - this->cv.notify_all(); - } - this->threads.resize(nThreads); // safe to delete because the threads are detached - this->flags.resize(nThreads); // safe to delete because the threads have copies of shared_ptr of the flags, not originals - } - } - } - - // empty the queue - void clear_queue() { - std::function * _f; - while (this->q.pop(_f)) - delete _f; // empty the queue - } - - // pops a functional wrapper to the original function - std::function pop() { - std::function * _f = nullptr; - this->q.pop(_f); - std::unique_ptr> func(_f); // at return, delete the function even if an exception occurred - std::function f; - if (_f) - f = *_f; - return f; - } - - // wait for all computing threads to finish and stop all threads - // may be called asynchronously to not pause the calling thread while waiting - // if isWait == true, all the functions in the queue are run, otherwise the queue is cleared without running the functions - void stop(bool isWait = false) { - if (!isWait) { - if (this->isStop) - return; - this->isStop = true; - for (int i = 0, n = this->size(); i < n; ++i) { - *this->flags[i] = true; // command the threads to stop - } - this->clear_queue(); // empty the queue - } - else { - if (this->isDone || this->isStop) - return; - this->isDone = true; // give the waiting threads a command to finish - } - { - std::unique_lock lock(this->mutex); - this->cv.notify_all(); // stop all waiting threads - } - for (int i = 0; i < static_cast(this->threads.size()); ++i) { // wait for the computing threads to finish - if (this->threads[i]->joinable()) - this->threads[i]->join(); - } - // if there were no threads in the pool but some functors in the queue, the functors are not deleted by the threads - // therefore delete them here - this->clear_queue(); - this->threads.clear(); - this->flags.clear(); - } - - template - auto push(F && f, Rest&&... rest) ->std::future { - auto pck = std::make_shared>( - std::bind(std::forward(f), std::placeholders::_1, std::forward(rest)...) - ); - auto _f = new std::function([pck](int id) { - (*pck)(id); - }); - this->q.push(_f); - std::unique_lock lock(this->mutex); - this->cv.notify_one(); - return pck->get_future(); - } - - // run the user's function that excepts argument int - id of the running thread. returned value is templatized - // operator returns std::future, where the user can get the result and rethrow the catched exceptins - template - auto push(F && f) ->std::future { - auto pck = std::make_shared>(std::forward(f)); - auto _f = new std::function([pck](int id) { - (*pck)(id); - }); - this->q.push(_f); - std::unique_lock lock(this->mutex); - this->cv.notify_one(); - return pck->get_future(); - } - - - private: - - // deleted - thread_pool(const thread_pool &);// = delete; - thread_pool(thread_pool &&);// = delete; - thread_pool & operator=(const thread_pool &);// = delete; - thread_pool & operator=(thread_pool &&);// = delete; - - void set_thread(int i) { - std::shared_ptr> flag(this->flags[i]); // a copy of the shared ptr to the flag - auto f = [this, i, flag/* a copy of the shared ptr to the flag */]() { - std::atomic & _flag = *flag; - std::function * _f; - bool isPop = this->q.pop(_f); - while (true) { - while (isPop) { // if there is anything in the queue - std::unique_ptr> func(_f); // at return, delete the function even if an exception occurred - (*_f)(i); - if (_flag) - return; // the thread is wanted to stop, return even if the queue is not empty yet - else - isPop = this->q.pop(_f); - } - // the queue is empty here, wait for the next command - std::unique_lock lock(this->mutex); - ++this->nWaiting; - this->cv.wait(lock, [this, &_f, &isPop, &_flag](){ isPop = this->q.pop(_f); return isPop || this->isDone || _flag; }); - --this->nWaiting; - if (!isPop) - return; // if the queue is empty and this->isDone == true or *flag then return - } - }; - this->threads[i].reset(new std::thread(f)); // compiler may not support std::make_unique() - } - - void init() { this->nWaiting = 0; this->isStop = false; this->isDone = false; } - - std::vector> threads; - std::vector>> flags; - detail::Queue *> q; - std::atomic isDone; - std::atomic isStop; - std::atomic nWaiting; // how many threads are waiting - - std::mutex mutex; - std::condition_variable cv; - }; - -} - -#endif // __ctpl_stl_thread_pool_H__ \ No newline at end of file diff --git a/ZAPDTR/ZAPD/genbuildinfo.py b/ZAPDTR/ZAPD/genbuildinfo.py deleted file mode 100644 index 91a567d31..000000000 --- a/ZAPDTR/ZAPD/genbuildinfo.py +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/python3 - -import argparse -from datetime import datetime -import getpass -import subprocess - -parser = argparse.ArgumentParser() -parser.add_argument("--devel", action="store_true") -args = parser.parse_args() - -with open("build/ZAPD/BuildInfo.cpp", "w+") as buildFile: - label = subprocess.check_output(["git", "describe", "--always"]).strip().decode("utf-8") - now = datetime.now() - if args.devel: - label += " ~ Development version" - buildFile.write("extern const char gBuildHash[] = \"" + label + "\";\n") - #buildFile.write("extern const char gBuildDate[] = \"" + now.strftime("%Y-%m-%d %H:%M:%S") + "\";\n") diff --git a/ZAPDTR/ZAPD/packages.config b/ZAPDTR/ZAPD/packages.config deleted file mode 100644 index c387aaed7..000000000 --- a/ZAPDTR/ZAPD/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/ZAPDTR/ZAPD/pathconf.c b/ZAPDTR/ZAPD/pathconf.c deleted file mode 100644 index 8ef448999..000000000 --- a/ZAPDTR/ZAPD/pathconf.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -long pathconf(const char *path, int name) { - return -1; -} - diff --git a/ZAPDTR/ZAPD/yaz0/readwrite.h b/ZAPDTR/ZAPD/yaz0/readwrite.h deleted file mode 100644 index af3471590..000000000 --- a/ZAPDTR/ZAPD/yaz0/readwrite.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __READWRITE_H__ -#define __READWRITE_H__ - -#include - -/* variables */ -union { - uint32_t u; - float f; -} __u32_f32_union__; - -#define U32(x) \ - ((uint32_t)((((uint8_t*)(x))[0] << 24) | (((uint8_t*)(x))[1] << 16) | \ - (((uint8_t*)(x))[2] << 8) | ((uint8_t*)(x))[3])) -#define U16(x) ((uint16_t)(((*((uint8_t*)(x))) << 8) | ((uint8_t*)(x))[1])) -#define U8(x) ((uint8_t)((uint8_t*)(x))[0]) -#define S32(x) ((int32_t)(U32(x))) -#define S16(x) ((int16_t)(U16(x))) -#define F32(x) (((__u32_f32_union__.u = U32(x)) & 0) + __u32_f32_union__.f) - -#define W32(x, v) \ - { \ - *((uint8_t*)x + 3) = ((v)&0xFF); \ - *((uint8_t*)x + 2) = (((v) >> 8) & 0xFF); \ - *((uint8_t*)x + 1) = (((v) >> 16) & 0xFF); \ - *((uint8_t*)x + 0) = (((v) >> 24) & 0xFF); \ - } - -#endif \ No newline at end of file diff --git a/ZAPDTR/ZAPD/yaz0/yaz0.cpp b/ZAPDTR/ZAPD/yaz0/yaz0.cpp deleted file mode 100644 index 885f41d1d..000000000 --- a/ZAPDTR/ZAPD/yaz0/yaz0.cpp +++ /dev/null @@ -1,227 +0,0 @@ -#include -#include -#include -#include -#include -#include "readwrite.h" - -#include "yaz0.h" - -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; - -/* internal declarations */ -int yaz0_encode_internal(const u8* src, int srcSize, u8* Data); - -int yaz0_get_size(u8* src) { return U32(src + 0x4); } - -u32 toDWORD(u32 d) { - u8 w1 = d & 0xFF; - u8 w2 = (d >> 8) & 0xFF; - u8 w3 = (d >> 16) & 0xFF; - u8 w4 = d >> 24; - return (w1 << 24) | (w2 << 16) | (w3 << 8) | w4; -} - -// simple and straight encoding scheme for Yaz0 -u32 longest_match_brute(const u8* src, int size, int pos, u32* pMatchPos) { - int startPos = pos - 0x1000; - int max_match_size = size - pos; - u32 best_match_size = 0; - u32 best_match_pos = 0; - - if (max_match_size < 3) return 0; - - if (startPos < 0) startPos = 0; - - if (max_match_size > 0x111) max_match_size = 0x111; - - for (int i = startPos; i < pos; i++) { - int current_size; - for (current_size = 0; current_size < max_match_size; current_size++) { - if (src[i + current_size] != src[pos + current_size]) { - break; - } - } - if (current_size > best_match_size) { - best_match_size = current_size; - best_match_pos = i; - if (best_match_size == 0x111) break; - } - } - *pMatchPos = best_match_pos; - return best_match_size; -} - -u32 longest_match_rabinkarp(const u8* src, int size, int pos, u32* match_pos) { - int startPos = pos - 0x1000; - int max_match_size = size - pos; - u32 best_match_size = 0; - u32 best_match_pos = 0; - - if (max_match_size < 3) return 0; - - if (startPos < 0) startPos = 0; - - if (max_match_size > 0x111) max_match_size = 0x111; - - int find_hash = src[pos] << 16 | src[pos + 1] << 8 | src[pos + 2]; - int current_hash = src[startPos] << 16 | src[startPos + 1] << 8 | src[startPos + 2]; - - for (int i = startPos; i < pos; i++) { - if(current_hash == find_hash) { - int current_size; - for (current_size = 3; current_size < max_match_size; current_size++) { - if (src[i + current_size] != src[pos + current_size]) { - break; - } - } - if (current_size > best_match_size) { - best_match_size = current_size; - best_match_pos = i; - if (best_match_size == 0x111) break; - } - } - current_hash = (current_hash << 8 | src[i + 3]) & 0xFFFFFF; - } - *match_pos = best_match_pos; - - return best_match_size; -} - -int yaz0_encode_internal(const u8* src, int srcSize, u8* Data) { - int srcPos = 0; - - int bitmask = 0x80; - u8 currCodeByte = 0; - int currCodeBytePos = 0; - int pos = currCodeBytePos + 1; - - while (srcPos < srcSize) { - u32 numBytes; - u32 matchPos; - - numBytes = longest_match_rabinkarp(src, srcSize, srcPos, &matchPos); - //fprintf(stderr, "pos %x len %x pos %x\n", srcPos, (int)numBytes, (int)matchPos); - if (numBytes < 3) { - //fprintf(stderr, "single byte %02x\n", src[srcPos]); - Data[pos++] = src[srcPos++]; - currCodeByte |= bitmask; - } else { - // RLE part - u32 dist = srcPos - matchPos - 1; - - if (numBytes >= 0x12) // 3 byte encoding - { - Data[pos++] = dist >> 8; // 0R - Data[pos++] = dist & 0xFF; // FF - if (numBytes > 0xFF + 0x12) numBytes = 0xFF + 0x12; - Data[pos++] = numBytes - 0x12; - } else // 2 byte encoding - { - Data[pos++] = ((numBytes - 2) << 4) | (dist >> 8); - Data[pos++] = dist & 0xFF; - } - srcPos += numBytes; - } - bitmask >>= 1; - // write eight codes - if (!bitmask) { - Data[currCodeBytePos] = currCodeByte; - currCodeBytePos = pos++; - - currCodeByte = 0; - bitmask = 0x80; - } - } - if (bitmask) { - Data[currCodeBytePos] = currCodeByte; - } - - return pos; -} - -std::vector yaz0_encode_fast(const u8* src, int src_size) { - std::vector buffer; - std::vector> lut; - lut.resize(0x1000000); - - for (int i = 0; i < src_size - 3; ++i) { - lut[src[i + 0] << 16 | src[i + 1] << 8 | src[i + 2]].push_back(i); - } - - return buffer; -} - -std::vector yaz0_encode(const u8* src, int src_size) { - std::vector buffer(src_size * 10 / 8 + 16); - u8* dst = buffer.data(); - - // write 4 bytes yaz0 header - memcpy(dst, "Yaz0", 4); - - // write 4 bytes uncompressed size - W32(dst + 4, src_size); - - // encode - int dst_size = yaz0_encode_internal(src, src_size, dst + 16); - int aligned_size = (dst_size + 31) & -16; - buffer.resize(aligned_size); - -#if 0 - std::vector decompressed(src_size); - yaz0_decode(buffer.data(), decompressed.data(), src_size); - if(memcmp(src, decompressed.data(), src_size)) { - fprintf(stderr, "Decompressed buffer is different from original\n"); - } -#endif - - return buffer; -} - -void yaz0_decode(const uint8_t* source, uint8_t* decomp, int32_t decompSize) { - uint32_t srcPlace = 0, dstPlace = 0; - uint32_t i, dist, copyPlace, numBytes; - uint8_t codeByte, byte1, byte2; - uint8_t bitCount = 0; - - source += 0x10; - while (dstPlace < decompSize) { - /* If there are no more bits to test, get a new byte */ - if (!bitCount) { - codeByte = source[srcPlace++]; - bitCount = 8; - } - - /* If bit 7 is a 1, just copy 1 byte from source to destination */ - /* Else do some decoding */ - if (codeByte & 0x80) { - decomp[dstPlace++] = source[srcPlace++]; - } else { - /* Get 2 bytes from source */ - byte1 = source[srcPlace++]; - byte2 = source[srcPlace++]; - - /* Calculate distance to move in destination */ - /* And the number of bytes to copy */ - dist = ((byte1 & 0xF) << 8) | byte2; - copyPlace = dstPlace - (dist + 1); - numBytes = byte1 >> 4; - - /* Do more calculations on the number of bytes to copy */ - if (!numBytes) - numBytes = source[srcPlace++] + 0x12; - else - numBytes += 2; - - /* Copy data from a previous point in destination */ - /* to current point in destination */ - for (i = 0; i < numBytes; i++) decomp[dstPlace++] = decomp[copyPlace++]; - } - - /* Set up for the next read cycle */ - codeByte = codeByte << 1; - bitCount--; - } -} \ No newline at end of file diff --git a/ZAPDTR/ZAPD/yaz0/yaz0.h b/ZAPDTR/ZAPD/yaz0/yaz0.h deleted file mode 100644 index 0d5cc3cfd..000000000 --- a/ZAPDTR/ZAPD/yaz0/yaz0.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include - -void yaz0_decode(const uint8_t* src, uint8_t* dest, int32_t destsize); -std::vector yaz0_encode(const uint8_t* src, int src_size); \ No newline at end of file diff --git a/ZAPDTR/copycheck.py b/ZAPDTR/copycheck.py deleted file mode 100755 index 36288f685..000000000 --- a/ZAPDTR/copycheck.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env python3 - -import os -from shutil import copyfile - -if (os.environ.get('ZAPD_COPYDIR') != None): - print("Copying ZAPD.out to repo...") - #print(os.environ.get('ZAPD_COPYDIR')) - copyfile("ZAPD.out", os.environ.get('ZAPD_COPYDIR') + "/ZAPD.out") diff --git a/ZAPDTR/docs/zapd_extraction_xml_reference.md b/ZAPDTR/docs/zapd_extraction_xml_reference.md deleted file mode 100644 index 78817dc6e..000000000 --- a/ZAPDTR/docs/zapd_extraction_xml_reference.md +++ /dev/null @@ -1,680 +0,0 @@ -# ZAPD extraction XML reference - -This document aims to be a small reference of how to create a compatible xml file for ZAPD. - -## Table of contents - -- [ZAPD extraction XML reference](#zapd-extraction-xml-reference) - - [Table of contents](#table-of-contents) - - [Basic XML](#basic-xml) - - [Resources types](#resources-types) - - [File](#file) - - [ExternalFile](#externalfile) - - [Texture](#texture) - - [Background](#background) - - [Blob](#blob) - - [DList](#dlist) - - [TextureAnimation](#textureanimation) - - [Scene and Room](#scene-and-room) - - [AltHeader](#altheader) - - [Animation](#animation) - - [PlayerAnimation](#playeranimation) - - [CurveAnimation](#curveanimation) - - [LegacyAnimation](#legacyanimation) - - [Skeleton](#skeleton) - - [LimbTable](#limbtable) - - [Limb](#limb) - - [Symbol](#symbol) - - [Collision](#collision) - - [Scalar](#scalar) - - [Vector](#vector) - - [Vtx](#vtx) - - [Mtx](#mtx) - - [Cutscene](#cutscene) - - [Array](#array) - - [Path](#path) - - [PlayerAnimationData](#playeranimationdata) - - [Pointer](#pointer) - -## Basic XML - -An example of an object xml: - -```xml - - - - - - - - - - - - - - - - - - - -``` - -Every xml must have a `` tag. It must have at least one `` child. - -## Resources types - -The following is a list of the resources/tags supported by ZAPD, and the attributes needed by each one. - -For most resources inside a `` tag **you should also set an `Offset` attribute**. This is the offset (within the file) of the resource you are exporting. The `Offset` attribute is expected to be in hexadecimal, for example `Offset="0x41F0"`. - -It's worth noting that every tag expects a `Name="gNameOfTheAsset"`. This is will be the name of the extracted variable in the output C code. Every asset must be prefixed with `g` and the suffix should represent the type of the variable. - -Every tag can accept a `Static` attribute to specify if the asset should be marked as `static` or not. -There are 3 valid values (defaults to `Global`): - -- `Global`: Mark static if the flag `--static` was used. -- `On`: Override the global config and **always mark** as `static`. -- `Off`: Override the global config and **don't mark** as `static`. - -This table summarizes if the asset will be marked `static` (✅) or not (❌) -| `Static=""` attribute in XML | Without `--static` flag | With `--static` flag | -| ---------------------------- | ----------------------- | -------------------- | -| `On` | ✅ | ✅ | -| `Global` (default) | ❌ | ✅ | -| `Off` | ❌ | ❌ | - -------------------------- - -### File - -- Example of this tag: - -```xml - -``` - -- Attributes: - - - `Name`: Required. The name of the file in `baserom/` which will be extracted. - - `OutName`: Optional. The output name of the generated C source file. Defaults to the value passed to `Name`. - - `Segment`: Optional. This is the segment number of the current file. Expects a decimal number between 0 and 15 inclusive, usually 6 if it is an object. If not specified, the file will use VRAM instead of segmented addresses. - - `BaseAddress`: Optional. RAM address of the file. Expects a hex number (with `0x` prefix). Default value: `0`. - - `RangeStart`: Optional. File offset where the extraction will begin. Hex. Default value: `0x000000000`. - - `RangeEnd`: Optional. File offset where the extraction will end. Hex. Default value: `0xFFFFFFFF`. - - `Game`: Optional. Valid values: `OOT`, `MM`, `SW97` and `OOTSW97`. Default value: `OOT`. - -------------------------- - -### ExternalFile - -Allows ZAPD to map segmented addresses to variables declared in other files by using its XML. - -It is useful for objects that use variables from `gameplay_keep`, `gameplay_dangeon_keep`, `gameplay_field_keep`, etc. - -This tag can be used in the global `config.xml` file. - -- Example of this tag: - -```xml - -``` - -- Attributes: - - - `XmlPath`: Required. The path of the XML, relative to the value set by `ExternalXMLFolder` in the configuration file. - - `OutPath`: Required. The path were the header for the corresponding external file is. It is used to `#include` it in the generated `.c` file. - -------------------------- - -### Texture - -Textures are extracted as `.png` files. - -- Example: - -```xml - -``` - -Will be defined as: - -```c -u64 gCraterSmokeConeTex[] = { -#include "assets/objects/object_spot17_obj/crater_smoke_cone.ia8.inc.c" -}; -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Tex`, unless it is a palette, in that case it is suffixed by `TLUT`. - - `OutName`: Required. The filename of the extracted `.png` file. - - `Format`: Required. The format of the image. Valid values: `rgba32`, `rgba16`, `i4`, `i8`, `ia4`, `ia8`, `ia16`, `ci4` and `ci8`. - - `Width`: Required. Width in pixels of the image. - - `Height`: Required. Height in pixels of the image. - - `TlutOffset`: Optional. Specifies the tlut's offset used by this texture. This attribute is only valid if `Format` is either `ci4` or `ci8`, otherwise an exception would be thrown. - - `ExternalTlut`: Optional. Specifies that the texture's tlut is in a different file. Takes the filename of the file that contains the tlut. - - `ExternalTlutOffset`: Optional. Specifies the offset in the `ExternalTlut` of the tlut for the given texture. - - `SplitTlut`: Optional. Specifies that the given texture should take from the upper half of the tlut. Takes a bool, i.e. one of `true`, `false`, `1`, `0`. - -The following is a list of the texture formats the Nintendo 64 supports, with their gfxdis names and ZAPD format names. - -| Format name | Typing in `gsDPLoadTextureBlock` | "Format" in xml | -| ----------------------------------------------- | -------------------------------- | --------------- | -| 4-bit intensity (I) | `G_IM_FMT_I, G_IM_SIZ_4b` | `i4` | -| 4-bit intensity with alpha (I/A) (3/1) | `G_IM_FMT_IA, G_IM_SIZ_4b` | `ia4` | -| 4-bit color index (CI) | `G_IM_FMT_CI, G_IM_SIZ_4b` | `ci4` | -| 8-bit I | `G_IM_FMT_I, G_IM_SIZ_8b` | `i8` | -| 8-bit IA (4/4) | `G_IM_FMT_IA, G_IM_SIZ_8b` | `ia8` | -| 8-bit CI | `G_IM_FMT_CI, G_IM_SIZ_8b` | `ci8` | -| 16-bit red, green, blue, alpha (RGBA) (5/5/5/1) | `G_IM_FMT_RGBA, G_IM_SIZ_16b` | `rgba16` | -| 16-bit IA (8/8) | `G_IM_FMT_IA, G_IM_SIZ_16b` | `ia16` | -| 16-bit YUV (Luminance, Blue-Y, Red-Y) | `G_IM_FMT_YUV, G_IM_SIZ_16b` | (not used) | -| 32-bit RGBA (8/8/8/8) | `G_IM_FMT_RGBA, G_IM_SIZ_32b` | `rgba32` | - -If you want to know more about this formats, you can check [`gsDPLoadTextureBlock`](http://n64devkit.square7.ch/n64man/gdp/gDPLoadTextureBlock.htm) for most formats, or [`gDPLoadTextureBlock_4b`](http://n64devkit.square7.ch/n64man/gdp/gDPLoadTextureBlock_4b.htm) for the 4-bit formats. - -------------------------- - -### Background - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Background`. - - `OutName`: Required. The filename of the extracted `.jpg` file. - -※ Explicit use of this tag isn't often necesary because it would probably be extracted automatically by another extracted element. You can use this to name them if you don't like the autogenerated name. - -------------------------- - -### Blob - -Blob are binary data that will be extracted as `.bin` files. - -- Example: - -```xml - -``` - -Will be defined as: - -```c - -u8 gFireTempleBlob_00CCC0[] = { -#include "assets/objects/object_hidan_objects/gFireTempleBlob_00CCC0.bin.inc.c" -}; -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Blob`. - - `Size`: Required. Amount of bytes to extract. Hex. - -※ We usually use blobs when we can't figure out the content's type of chunk of data. - -------------------------- - -### DList - -A.k.a. Display list, or Gfx. - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `DL`. - -------------------------- - -### TextureAnimation - -A data type exclusive to Majora's Mask, that has scrolling, color changing, and texture changing capabilities. Declaring the main array will generate everything else; textures for the TextureCycle type must be declared manually in the XML to use symbols. (If it does reference any undeclared textures, ZAPD will warn and give the their offsets.) - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `TexAnim`. - -------------------------- - -### Scene and Room - -`Scene`s and `Room`s are a bit special, because `Room`s usually needs assets declared in their respective `Scene` (which is in a different file), so they need to be extracted together. - -To accomplish this, the scene and each of their rooms must be declared in the same XML. - -- Example: - -```xml - - - - - - - - - - - - - - -``` - -- Attributes: - - - `HackMode`: Optional. This is a simple non-hardcoded way to handle some edge cases. Valid values: `syotes_room`. - -------------------------- - -### AltHeader - -Like `Scene`s and `Room`s, `AltHeader`s is special too. It should always be declared in the same `File` as a `Scene` or a `Room`. - -- Example: - -```xml - - - - - - - - - - - - - - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `AltHeader`. - -------------------------- - -### Animation - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Anim`. - -------------------------- - -### PlayerAnimation - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Anim`. - -------------------------- - -### CurveAnimation - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Anim`. - - `SkelOffset`: Required. Offset of the `CurveSkeleton` (I.e. a [`Skeleton`](#skeleton) resource with `Type="Curve"`) related to this animation. - -------------------------- - -### LegacyAnimation - -Useful only for the unused `object_human`'s animation data. - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Anim`. - -------------------------- - -### Skeleton - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Skel`. - - `Type`: Required. Valid values: `Normal`, `Flex` and `Curve`. - - `LimbType`: Required. Valid values: `Standard`, `LOD`, `Skin`, `Curve` and `Legacy`. - - `EnumName`: Optional. The name of `typedef`'d limb enum. - - `LimbNone`: Optional. The name of the limb with index zero in the limb enum. - - `LimbMax`: Optional. The name of the max limb index in the limb enum. - -ZAPD is able to generate a limb enum by itself only if all the required data is provided. Providing some but not all the required data would trigger an error and the execution will halt. - -The required data is providing the `EnumName`, `LimbNone` and `LimbMax` attributes in the `Skeleton` or `LimbTable` node and the `EnumName` attribute in every `Limb` of this skeleton. - -※ There are no restrictions in the `Type` and `LimbType` attributes besides the valid values, so any skeleton type can be combined with any limb type. - -------------------------- - -### LimbTable - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Skel`. - - `LimbType`: Required. Valid values: `Standard`, `LOD`, `Skin`, `Curve` and `Legacy`. - - `Count`: Required. Amount of limbs. Integer. - - `EnumName`: Optional. The name of `typedef`'d limb enum. - - `LimbNone`: Optional. The name of the limb with index zero in the limb enum. - - `LimbMax`: Optional. The name of the max limb index in the limb enum. - -See [Skeleton](#skeleton) for info on the limb enum generation. - -------------------------- - -### Limb - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Limb`. - - `LimbType`: Required. Valid values: `Standard`, `LOD`, `Skin`, `Curve` and `Legacy`. - - `EnumName`: Optional. The name used for this limb in the limbs enum. It must be either present in every limb or in none. - -See [Skeleton](#skeleton) for info on the limb enum generation. - -------------------------- - -### Symbol - -A special element that allows declaring a variable without actually extracting it from the current file. Useful when a resource references an element from another file. The symbol will be declared as `extern`. - -- Example: - -```xml - -``` - -Will be declared as: - -```c -extern u8 gJsjutanShadowTex[2048]; -``` - -- Attributes: - - - `Type`: The type of the declared variable. If missing, it will default to `void*`. - - `TypeSize`: The size in bytes of the type. If missing, it will default to `4` (the size of a word and a pointer). Integer or hex value. - - `Count`: Optional. If it is present, the variable will be declared as an array instead of a plain variable. The value of this attribute specifies the length of the array. If `Count` is present but it has no value (`Count=""`), then the length of the array will not be specified either in the declared variable. Integer or hex value. - - `Static`: This attribute can't be enabled on a Symbol node. A warning will be showed in this case. - -------------------------- - -### Collision - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Col`. - -------------------------- - -### Scalar - -Allows the extraction of a single number. - -- Example: - -```xml - -``` - -Will be extracted as: - -```c -u64 pad34F8 = { 0 }; -``` - -- Attributes: - - - `Name`: Required. Suffixed by ~~`TBD`~~. - - `Type`: Required. Valid values: `s8`, `u8`, `x8`, `s16`, `u16`, `x16`, `s32`, `u32`, `x32`, `s64`, `u64`, `x64`, `f32` and `f64`. - -※ Can be wrapped in an [`Array`](#array) tag. - -------------------------- - -### Vector - -Extracts a vector. - -Current supported types are `Vec3s`, `Vec3i` or `Vec3f`. - -- Example: - -```xml - - - -``` - -Will be extracted as: - -```c -Vec3s gLinkPauseChildDekuShieldJointTable[24] = { - { -37, 2346, 93 }, - { 0, 11995, 0 }, - { -16385, -305, -16333 }, - { 0, 51, 12 }, - { 3761, 2263, -384 }, - { 0, 0, 3786 }, - { 1594, 1384, -18344 }, - { -2288, -2428, -1562 }, - { 0, 0, 3219 }, - { -2148, -5, -16840 }, - { 15365, -1708, 15611 }, - { 1761, 8365, 17711 }, - { 0, 0, 18859 }, - { 0, 0, 0 }, - { -9392, -9579, 28686 }, - { 0, 0, -7093 }, - { -2748, 685, -14092 }, - { 213, 6553, -32212 }, - { 0, 0, -1877 }, - { 3267, 3309, -16090 }, - { -18101, 25946, -2670 }, - { -104, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 } -}; -``` - -- Attributes: - - - `Name`: Required. Suffixed by ~~`TBD`~~. - - `Type`: Required. Specifies the vector's type (`Vec3s`, `Vec3i` and `Vec3f`). Valid values: `s16`, `s32` and `f32`. - - `Dimensions`: Required. The amount of dimensions of the vector. Valid values: `3`. - -※ Can be wrapped in an [`Array`](#array) tag. - -------------------------- - -### Vtx - -- Example: - -```xml - - - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Vtx`. - -※ Can be wrapped in an [`Array`](#array) tag. - -------------------------- - -### Mtx - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Mtx`. - -※ Explicit use of this tag isn't often necesary because it would probably be extracted automatically by another extracted element. - -------------------------- - -### Cutscene - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Cs`. - -※ Explicit use of this tag isn't often necesary because it would probably be extracted automatically by another extracted element. - -------------------------- - -### Array - -The `Array` element is special, because it needs an inner element to work. It will declare an array of its inner element. - -Currently, only [`Pointer`](#pointer), [`Scalar`](#scalar), [`Vector`](#vector) and [`Vtx`](#vtx) support being wrapped in an array. - -- Example: - -```xml - - - -``` - -- Attributes: - - - `Name`: Required. How the variable will be named. By our convention it should be prefixed by `g`. The sufix is mandated by the element contained. - - `Count`: Required. Amount of elements. Integer. - -------------------------- - -### Path - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `Path`. - - `NumPaths`: Optional. The amount of paths contained in the array. It must be a positive integer. - -------------------------- - -### PlayerAnimationData - -Allows the extraction of the specific data of the player animations which are found in the `link_animetion` file. - -- Example: - -```xml - -``` - -- Attributes: - - - `Name`: Required. Suffixed by `AnimData`. - - `FrameCount`: Required. The length of the animation in frames. It must be a positive integer. - -------------------------- - -### Pointer - -Allows the extraction of a variable that contains a pointer - -- Example: - -```xml - - - -``` - -- Attributes: - - - `Name`: Required. - - `Type`: Required. The type of the extracted pointer. - -※ Can be wrapped in an [`Array`](#array) tag. - -------------------------- diff --git a/ZAPDTR/docs/zapd_warning_example.png b/ZAPDTR/docs/zapd_warning_example.png deleted file mode 100644 index a001c64d6..000000000 Binary files a/ZAPDTR/docs/zapd_warning_example.png and /dev/null differ diff --git a/ZAPDTR/docs/zapd_xml_spec.md b/ZAPDTR/docs/zapd_xml_spec.md deleted file mode 100644 index 9fcc0d4aa..000000000 --- a/ZAPDTR/docs/zapd_xml_spec.md +++ /dev/null @@ -1,55 +0,0 @@ -# ZAPD XML specification - -ZAPD XMLs use a restrictive subset of the XML standard: any ZAPD XML must be a valid XML (All elements starting with `` ending appropriately with ``, single "empty-element" tags with `/` at the end, etc.). - -Reminder that in - -```xml - - - - - - - - - -``` - -``, ``, `` are *children* of ``, but `` is not. `` is a *descendent* of `` and a child of ``. - -- Every XML's outermost element start/end tag is a single ``. -- The children of a `` must be ``s. -- A `` has *resources* as children. A resource is almost always single empty-element tag, and has one of the types - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - - `` - -- A `` cannot descend from a ``. -- All resources must be children of a ``. -- `` is the only paired resource tag enclosing an element; the element must be a single resource tag, one of - - `` - - `` - - `` diff --git a/ZAPDTR/lib/libgfxd/.gitrepo b/ZAPDTR/lib/libgfxd/.gitrepo deleted file mode 100644 index 4c8b7fe76..000000000 --- a/ZAPDTR/lib/libgfxd/.gitrepo +++ /dev/null @@ -1,12 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme -; -[subrepo] - remote = git@github.com:glankk/libgfxd.git - branch = master - commit = 008f73dca8ebc9151b205959b17773a19c5bd0da - parent = c92cfda733aa740a53129a21f69c8abb08a465c7 - method = merge - cmdver = 0.4.3 diff --git a/ZAPDTR/lib/libgfxd/LICENSE b/ZAPDTR/lib/libgfxd/LICENSE deleted file mode 100644 index a7655f829..000000000 --- a/ZAPDTR/lib/libgfxd/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2016-2021 glank (glankk@github.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/ZAPDTR/lib/libgfxd/Makefile b/ZAPDTR/lib/libgfxd/Makefile deleted file mode 100644 index 5c3edbef4..000000000 --- a/ZAPDTR/lib/libgfxd/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -CC ?= gcc -CFLAGS = -Wall -O2 -g -UC_OBJ = uc_f3d.o uc_f3db.o uc_f3dex.o uc_f3dexb.o uc_f3dex2.o -OBJ = gfxd.o $(UC_OBJ) -LIB = libgfxd.a - -CPPFLAGS-$(MT) += -DCONFIG_MT -CPPFLAGS += $(CPPFLAGS-y) - -.PHONY: all -all: $(LIB) - -.PHONY: clean -clean: - rm -f $(OBJ) $(LIB) - -.INTERMEDIATE: $(OBJ) - -$(OBJ): gbi.h gfxd.h priv.h -$(UC_OBJ): uc.c uc_argfn.c uc_argtbl.c uc_macrofn.c uc_macrotbl.c - -$(LIB): $(OBJ) - $(AR) rcs $@ $^ - -%.o: %.c - $(COMPILE.c) $(OUTPUT_OPTION) $< diff --git a/ZAPDTR/lib/libgfxd/README.md b/ZAPDTR/lib/libgfxd/README.md deleted file mode 100644 index 2e8258943..000000000 --- a/ZAPDTR/lib/libgfxd/README.md +++ /dev/null @@ -1,478 +0,0 @@ -## Installing -Run `make` for a single-threaded build, or `make MT=y` for a multi-threaded -build. Copy `libgfxd.a` to your lib directory, and `gfxd.h` to your include -directory. - -## Example usage -Example source code: -``` -#include -#include - -static int macro_fn(void) -{ - /* Print a tab before each macro, and a comma and newline after each - macro */ - gfxd_puts("\t"); - gfxd_macro_dflt(); /* Execute the default macro handler */ - gfxd_puts(",\n"); - - return 0; -} - -int main() -{ - /* Read from stdin and write to stdout */ - gfxd_input_fd(fileno(stdin)); - gfxd_output_fd(fileno(stdout)); - - /* Override the default macro handler to make the output prettier */ - gfxd_macro_fn(macro_fn); - - /* Select F3DEX as the target microcode */ - gfxd_target(gfxd_f3dex); - - /* Set the input endianness to big endian, and the word size to 4 */ - gfxd_endian(gfxd_endian_big, 4); - - /* Print an opening brace */ - gfxd_puts("{\n"); - - /* Execute until the end of input, or until encountering an invalid - command */ - gfxd_execute(); - - /* Print a closing brace */ - gfxd_puts("}\n"); -} -``` - -Example input (binary): -``` -0xe7000000, 0x00000000, -0xfc127e03, 0xfffffdf8, -0xb900031d, 0xc8112078, -0xb6000000, 0x000e0000, -0xb7000000, 0x00012000, -0xfa000000, 0xffffffff, -0x040030bf, 0x000002e0, -0xb1000204, 0x00020604, -0xb1080a0c, 0x000a0e0c, -0xb10a1012, 0x000a120e, -0xb1140200, 0x00140016, -0xb8000000, 0x00000000, -``` - -Example output: -``` -{ - gsDPPipeSync(), - gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, 1, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED), - gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), - gsSPClearGeometryMode(G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), - gsSPSetGeometryMode(G_CULL_BACK | G_FOG), - gsDPSetPrimColor(0, 0, 0xFF, 0xFF, 0xFF, 0xFF), - gsSPVertex(0x000002E0, 12, 0), - gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0), - gsSP2Triangles(4, 5, 6, 0, 5, 7, 6, 0), - gsSP1Quadrangle(5, 8, 9, 7, 0), - gsSP1Quadrangle(10, 1, 0, 11, 0), - gsSPEndDisplayList(), -} -``` - -## Input/output methods -The input consists of any number of `Gfx` packets, and the output is the -decompiled macros in plain-text. The endianness and microcode type of the input -can be set using `gfxd_endian` and `gfxd_target`. - -Several methods of doing I/O are available. No method is selected by default, -meaning there will be no input, and any output will be discarded. - ---- - -##### `void gfxd_input_buffer(const void *buf, int size)` -##### `void gfxd_output_buffer(char *buf, int size)` -Use the buffer pointed to by `buf`, of `size` bytes. - ---- - -##### `void gfxd_input_fd(int fd)` -##### `void gfxd_output_fd(int fd)` -Use `read()` / `write()` with the provided file descriptor, `fd`. - ---- - -##### `typedef int gfxd_input_fn_t(void *buf, int count)` -##### `typedef int gfxd_output_fn_t(const char *buf, int count)` -##### `void gfxd_input_callback(gfxd_input_fn_t *fn)` -##### `void gfxd_output_callback(gfxd_output_fn_t *fn)` -Use the provided callback function, `fn`. `fn` should copy at most `count` -bytes to/from `buf`, and return the number of bytes actually copied. The input -callback should return 0 to signal end of input. - -## Handlers -The macro handler function is responsible for writing the output of each -decompiled macro. The default macro handler is `gfxd_macro_dflt`, but this can -be changed with `gfxd_macro_fn`. The new handler can extend the default -function by calling `gfxd_macro_dflt` within it, or it can override it -completely. - ---- - -##### `int gfxd_macro_dflt()` -The default macro handler. Outputs the macro name, dynamic display list pointer -if one has been specified, and then each argument in order using the function -registered using `gfxd_arg_fn` (`gfxd_arg_dflt` by default), and returns zero. -Because it is designed to be extended, it only outputs the macro text, without -any whitespace or punctuation before or after. When this function is used as -the sole macro handler, it will output the entire display list on one line -without any separation between macros, which is probably not what you want. - ---- - -##### `void gfxd_macro_fn(gfxd_macro_fn_t *fn)` -Set `fn` to be the macro handler function. `fn` can be null, in which case the -handler is reset to the default. - ---- - -##### `void gfxd_arg_dflt(int arg_num)` -The default argument handler for `gfxd_macro_dflt`. For the argument with index -`arg_num`, calls `gfxd_arg_callbacks`, and prints the argument value if the -callback returns zero, or if there is no callback for the given argument. - ---- - -##### `void gfxd_arg_fn(gfxd_arg_fn_t *fn)` -Set `fn` to be the argument handler function, called by `gfxd_macro_dflt`, -for each argument in the current macro, not counting the dynamic display list -pointer if one has been specified. `fn` can be null, in which case the handler -is reset to the default. This only affects the output of `gfxd_macro_dflt`, and -has no observable effect if `gfxd_macro_dflt` is overridden (not extended). - -## Argument callbacks -Callbacks can be registered that will be executed when an argument of a certain -type is encountered. The default argument handler `gfxd_arg_dflt` will execute -callbacks as needed using `gfxd_arg_callbacks`. If a callback returns non-zero, -`gfxd_arg_dflt` will not output anything. This is to allow callbacks to -override the default argument output. Otherwise, `gfxd_arg_dflt` will output -the argument value after the callback function's output. - ---- - -##### `int gfxd_arg_callbacks(int arg_num)` -Examines the argument with index `arg_num` and executes the callback function -for that argument type, if such a callback is supported and has been -registered. This function returns the value that was returned by the callback -function. If no callback function has been registered for the argument type, -zero is returned. - -Most argument callbacks have some extra parameters containing information that -might be relevant to the argument that triggered the callback. The extra -information is extracted only from the current macro, as gfxd does not retain -any context information from previous or subsequent macros. If any of the extra -parameter values is not available in the current macro, the value for that -parameter is substituted with `-1` for signed parameters, and zero for unsigned -parameters. - ---- - -##### `typedef int gfxd_tlut_fn_t(uint32_t tlut, int32_t idx, int32_t count)` -##### `void gfxd_tlut_callback(gfxd_tlut_fn_t *fn)` -Set the callback function for palette arguments. The argument type is -`gfxd_Tlut`. The palette index is in `idx` and the number of colors in `count`. - ---- - -##### `typedef int gfxd_timg_fn_t(uint32_t timg, int32_t fmt, int32_t siz, int32_t width, int32_t height, int32_t pal)` -##### `void gfxd_timg_callback(gfxd_timg_fn_t *fn)` -Set the callback function for texture arguments. The argument type is -`gfxd_Timg`. The image format is in `fmt` and `siz`, the dimensions in `width` -and `height`, and the palette index in `pal`. - ---- - -##### `typedef int gfxd_cimg_fn_t(uint32_t cimg, int32_t fmt, int32_t siz, int32_t width)` -##### `void gfxd_cimg_callback(gfxd_cimg_fn_t *fn)` -Set the callback function for frame buffer arguments. The argument type is -`gfxd_Cimg`. The image format is in `fmt` and `siz`, and the horizontal -resolution in `width`. - ---- - -##### `typedef int gfxd_zimg_fn_t(uint32_t zimg)` -##### `void gfxd_zimg_callback(gfxd_zimg_fn_t *fn)` -Set the callback function for depth buffer arguments. The argument type is -`gfxd_Zimg`. - ---- - -##### `typedef int gfxd_dl_fn_t(uint32_t dl)` -##### `void gfxd_dl_callback(gfxd_dl_fn_t *fn)` -Set the callback function for display list arguments. The argument type is -`gfxd_Dl`. - ---- - -##### `typedef int gfxd_mtx_fn_t(uint32_t mtx)` -##### `void gfxd_mtx_callback(gfxd_mtx_fn_t *fn)` -Set the callback function for matrix arguments. The argument type is -`gfxd_Mtxptr`. - ---- - -##### `typedef int gfxd_lookat_fn_t(uint32_t lookat, int32_t count)` -##### `void gfxd_lookat_callback(gfxd_lookat_fn_t *fn)` -Set the callback function for lookat array arguments. The argument type is -`gfxd_Lookatptr`. The number of lookat structures (1 or 2) is in `count`. - ---- - -##### `typedef int gfxd_light_fn_t(uint32_t light, int32_t count)` -##### `void gfxd_light_callback(gfxd_light_fn_t *fn)` -Set the callback function for light array arguments. The argument type is -`gfxd_Lightptr`. The number of light structures is in `count`. - ---- - -##### `typedef int gfxd_seg_fn_t(uint32_t seg, int32_t num)` -##### `void gfxd_seg_callback(gfxd_seg_fn_t *fn)` -Set the callback function for segment base arguments. The argument type is -`gfxd_Segptr`. The segment number is in `num`. - ---- - -##### `typedef int gfxd_vtx_fn_t(uint32_t vtx, int32_t num)` -##### `void gfxd_vtx_callback(gfxd_vtx_fn_t *fn)` -Set the callback function for vertex array arguments. The argument type is -`gfxd_Vtxptr`. The number of vertex structures is in `num`. - ---- - -##### `typedef int gfxd_vp_fn_t(uint32_t vp)` -##### `void gfxd_vp_callback(gfxd_vp_fn_t *fn)` -Set the callback function for viewport arguments. The argument type is -`gfxd_Vp`. - ---- - -##### `typedef int gfxd_uctext_fn_t(uint32_t text, uint32_t size)` -##### `void gfxd_uctext_callback(gfxd_uctext_fn_t *fn)` -Set the callback function for microcode text arguments. The argument type is -`gfxd_Uctext`. The size of the text segment is in `size`. - ---- - -##### `typedef int gfxd_ucdata_fn_t(uint32_t data, uint32_t size)` -##### `void gfxd_ucdata_callback(gfxd_ucdata_fn_t *fn)` -Set the callback function for microcode data arguments. The argument type is -`gfxd_Ucdata`. The size of the data segment is in `size`. - ---- - -##### `typedef int gfxd_dram_fn_t(uint32_t dram, uint32_t size)` -##### `void gfxd_dram_callback(gfxd_dram_fn_t *fn)` -Set the callback function for generic pointer arguments. The argument type is -`gfxd_Dram`. The size of the data is in `size`. - -## General settings -These functions control general input and output settings. - ---- - -##### `void gfxd_target(gfxd_ucode_t ucode)` -Select `ucode` as the target microcode. `ucode` can be `gfxd_f3d`, `gfxd_f3db`, -`gfxd_f3dex`, `gfxd_f3dexb`, or `gfxd_f3dex2`. The microcode must be selected -before `gfxd_execute`, as no microcode is selected by default. - ---- - -##### `void gfxd_endian(int endian, int wordsize)` -Select `endian` as the endianness of the input, and `wordsize` as the size of -each word in number of bytes. `endian` can be `gfxd_endian_big`, -`gfxd_endian_little`, or `gfxd_endian_host` (the endianness of the host -machine). `wordsize` can be 1, 2, 4, or 8. Big endian is selected by default, -with a word size of 4. - ---- - -##### `void gfxd_dynamic(const char *arg)` -Enable or disable the use of dynamic `g` macros instead of static `gs` macros, -and select the dynamic display list pointer argument to be used. `arg` will be -used by `gfxd_macro_dflt` as the first argument to dynamic macros. If `arg` is -null, dynamic macros are disabled, and `gs` macros are used. Also affects the -result of `gfxd_macro_name`, as it will return either the dynamic or static -version of the macro name as selected by this setting. - ---- - -##### `void gfxd_enable(int cap)` -##### `void gfxd_disable(int cap)` -Enable or disable the feature specified by `cap`. Can be one of the following; -- `gfxd_stop_on_invalid`: Stop execution when encountering an invalid macro. -Enabled by default. -- `gfxd_stop_on_end`: Stop execution when encountering a `SPBranchList` or -`SPEndDisplayList`. Enabled by default. -- `gfxd_emit_dec_color`: Print color components as decimal instead of -hexadecimal. Disabled by default. -- `gfxd_emit_q_macro`: Print fixed-point conversion `q` macros for fixed-point -values. Disabled by default. -- `gfxd_emit_ext_macro`: Emit non-standard macros. Some commands are valid -(though possibly meaningless), but have no macros associated with them, such as -a standalone `G_RDPHALF_1`. When this feature is enabled, such a command will -produce a non-standard `gsDPHalf1` macro instead of a raw hexadecimal command. -Also enables some non-standard multi-packet texture loading macros. Disabled by -default. - ---- - -##### `void gfxd_udata_set(void *ptr)` -##### `void *gfxd_udata_get(void)` -Set or get a generic pointer that can be used to pass user-defined data in and -out of callback functions. - -## Execution -Decompilation is started using the `gfxd_execute` function. When gfxd is -executing (i.e. after `gfxd_execute` has been entered, and before it returns), -the general settings and the I/O settings should not be changed. - ---- - -##### `int gfxd_execute()` -Start executing gfxd with the current settings. For each macro, the macro -handler registered with `gfxd_macro_fn` is called. Execution ends when the -input ends, the macro handler returns non-zero, when an invalid macro is -encountered and `gfxd_stop_on_invalid` is enabled, or when `SPBranchList` or -`SPEndDisplayList` is encountered and `gfxd_stop_on_end` is enabled. If -execution ends due to an invalid macro, `-1` is returned. If execution ends -because the macro handler returns non-zero, the return value from the macro -handler is returned. Otherwise zero is returned. - -## Macro information -The following functions can be used to obtain information about the current -macro and its arguments. They should only be used in custom handlers and -callbacks from within `gfxd_execute`. If used elsewhere, their behavior is -undefined. - ---- - -##### `int gfxd_macro_offset()` -Returns the offset in the input data of the current macro. The offset starts -at zero when `gfxd_execute` is called. - ---- - -##### `int gfxd_macro_packets()` -Returns the number of `Gfx` packets within the current macro. - ---- - -##### `const void *gfxd_macro_data()` -Returns a pointer to the input data for the current macro. The data is not -byte-swapped. The data has a length of `sizeof(Gfx) * gfxd_macro_packets()`. - ---- - -##### `int gfxd_macro_id()` -Returns a number that uniquely identifies the current macro. The number will -be one of the constants in `gfxd.h`. - ---- - -##### `const char *gfxd_macro_name()` -Returns the name of the current macro. If the macro does not have a name (i.e. -it's invalid), null is returned. If a dynamic display list pointer has been -specified, the dynamic `g` version is returned. Otherwise the static `gs` -version is returned. The returned pointer is invalidated by a subsequent call -to `gfxd_macro_name`. - ---- - -##### `int gfxd_arg_count()` -Returns the number of arguments to the current macro, not including a dynamic -display list pointer if one has been specified. - ---- - -##### `int gfxd_arg_type(int arg_num)` -Returns a number that identifies the type of the argument with index `arg_num`. -The number will be one of the constants in `gfxd.h`. - ---- - -##### `const char *gfxd_arg_name(int arg_num)` -Returns the name of the argument with index `arg_num`. Argument names are not -canonical, nor are they needed for macro disassembly, but they can be useful -for informational and diagnostic purposes. - ---- - -##### `int gfxd_arg_fmt(int arg_num)` -Returns the data format of the argument with index `arg_num`. The return value -will be `gfxd_argfmt_i` for `int32_t`, `gfxd_argfmt_u` for `uint32_t`, or -`gfxd_argfmt_f` for `float`. When accessing the value of the argument with -`gfxd_arg_value`, the member with the corresponding type should be used. - ---- - -##### `const gfxd_value_t *gfxd_arg_value(int arg_num)` -Returns a pointer to the value of the argument with index `arg_num`. The value -is a union of type `gfxd_value_t` with the following layout; -``` -typedef union -{ - int32_t i; - uint32_t u; - float f; -} gfxd_value_t -``` - ---- - -##### `const gfxd_value_t *gfxd_value_by_type(int type, int idx)` -Returns a pointer to the value of the argument that is of `type`, and has order -`idx` in all arguments of that type. An `idx` of zero returns the first -argument that has the specified type. If there is no argument with the given -type and order, null is returned. - ---- - -##### `int gfxd_arg_valid(int arg_num)` -Returns non-zero if the argument with index `arg_num` is "valid", for some -definition of valid. An invalid argument generally means that the disassembler -found inconsistencies in the input data, or that the data can not be reproduced -by the current macro type. The argument still has a value that can be printed, -though the value is not guaranteed to make any sense. - -## Custom output -When the default handlers are overridden or extended, the custom handler -functions will want to do some output of their own. The following methods are -available for inserting custom text into the gfxd output. - ---- - -##### `int gfxd_write(const void *buf, int count)` -Insert `count` bytes from the buffer at `buf` into the output. The number of -characters written is returned. - ---- - -##### `int gfxd_puts(const char *str)` -Insert the null-terminated string at `str` into the output. The number of -characters written is returned. - ---- - -##### `int gfxd_printf(const char *fmt, ...)` -Insert the printf-formatted string described by `fmt` and additional arguments -into the output. Limited to 255 characters. The number of characters written is -returned. - ---- - -##### `int gfxd_print_value(int type, const gfxd_value_t *value)` -Insert the type-formatted value into the output. The type should be one of the -constants in `gfxd.h`. The number of characters written is returned. The -macro argument with index `n` can be printed with -`gfxd_print_value(gfxd_arg_type(n), gfxd_arg_value(n))`. diff --git a/ZAPDTR/lib/libgfxd/gbi.h b/ZAPDTR/lib/libgfxd/gbi.h deleted file mode 100644 index 69fa7f12e..000000000 --- a/ZAPDTR/lib/libgfxd/gbi.h +++ /dev/null @@ -1,3838 +0,0 @@ -/** - * gbi.h version 0.3.6 - * n64 graphics microcode interface library - * compatible with fast3d, f3dex, f3dex2, s2dex, and s2dex2 - * - * select a microcode with one of these preprocessor definitions; - * #define F3D_GBI - * for fast3d (selected automatically by default), or - * #define F3DEX_GBI - * for f3dex/s2dex, or - * #define F3DEX_GBI_2 - * for f3dex2/s2dex2 - * - * for early versions of fast3d and f3dex, also define the following; - * #define F3D_BETA - * - * ido incompatibilities; - * - use of c99 variadic macros - * - use of c99 fixed-width integer types - * - use of c99 designated initializers - * - use of c99 compound literals - * - use of c11 _Alignas - * - use of gnu c compound expressions - * - use of gnu c __typeof__ - * - * libultra incompatibilities; - * - many private, undocumented, or obsolete macros not commonly used by - * programmers are missing - * - many different implementation details that will produce matching gbi, - * but not matching code -**/ - -#ifndef N64_GBI_H -#define N64_GBI_H - -#include - -/* use fast3d by default */ -#if !defined(F3D_GBI) && !defined(F3DEX_GBI) && !defined(F3DEX_GBI_2) -# define F3D_GBI -#endif - -/* commands for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_SPNOOP 0x00 -# define G_MTX 0x01 -# define G_MOVEMEM 0x03 -# define G_VTX 0x04 -# define G_DL 0x06 -# if defined(F3D_BETA) -# define G_RDPHALF_2 0xB2 -# define G_RDPHALF_1 0xB3 -# define G_PERSPNORM 0xB4 -# else -# define G_RDPHALF_2 0xB3 -# define G_RDPHALF_1 0xB4 -# endif -# define G_LINE3D 0xB5 -# define G_CLEARGEOMETRYMODE 0xB6 -# define G_SETGEOMETRYMODE 0xB7 -# define G_ENDDL 0xB8 -# define G_SETOTHERMODE_L 0xB9 -# define G_SETOTHERMODE_H 0xBA -# define G_TEXTURE 0xBB -# define G_MOVEWORD 0xBC -# define G_POPMTX 0xBD -# define G_CULLDL 0xBE -# define G_TRI1 0xBF -# define G_NOOP 0xC0 -#endif - -/* commands for f3dex */ -#if defined(F3DEX_GBI) -# define G_LOAD_UCODE 0xAF -# define G_BRANCH_Z 0xB0 -# define G_TRI2 0xB1 -# if !defined(F3D_BETA) -# define G_MODIFYVTX 0xB2 -# endif -#endif - -/* commands for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_NOOP 0x00 -# define G_VTX 0x01 -# define G_MODIFYVTX 0x02 -# define G_CULLDL 0x03 -# define G_BRANCH_Z 0x04 -# define G_TRI1 0x05 -# define G_TRI2 0x06 -# define G_QUAD 0x07 -# define G_LINE3D 0x08 -# define G_SPECIAL_3 0xD3 -# define G_SPECIAL_2 0xD4 -# define G_SPECIAL_1 0xD5 -# define G_DMA_IO 0xD6 -# define G_TEXTURE 0xD7 -# define G_POPMTX 0xD8 -# define G_GEOMETRYMODE 0xD9 -# define G_MTX 0xDA -# define G_MOVEWORD 0xDB -# define G_MOVEMEM 0xDC -# define G_LOAD_UCODE 0xDD -# define G_DL 0xDE -# define G_ENDDL 0xDF -# define G_SPNOOP 0xE0 -# define G_RDPHALF_1 0xE1 -# define G_SETOTHERMODE_L 0xE2 -# define G_SETOTHERMODE_H 0xE3 -# define G_RDPHALF_2 0xF1 -#endif - -/* rdp commands */ -#define G_TEXRECT 0xE4 -#define G_TEXRECTFLIP 0xE5 -#define G_RDPLOADSYNC 0xE6 -#define G_RDPPIPESYNC 0xE7 -#define G_RDPTILESYNC 0xE8 -#define G_RDPFULLSYNC 0xE9 -#define G_SETKEYGB 0xEA -#define G_SETKEYR 0xEB -#define G_SETCONVERT 0xEC -#define G_SETSCISSOR 0xED -#define G_SETPRIMDEPTH 0xEE -#define G_RDPSETOTHERMODE 0xEF -#define G_LOADTLUT 0xF0 -#define G_SETTILESIZE 0xF2 -#define G_LOADBLOCK 0xF3 -#define G_LOADTILE 0xF4 -#define G_SETTILE 0xF5 -#define G_FILLRECT 0xF6 -#define G_SETFILLCOLOR 0xF7 -#define G_SETFOGCOLOR 0xF8 -#define G_SETBLENDCOLOR 0xF9 -#define G_SETPRIMCOLOR 0xFA -#define G_SETENVCOLOR 0xFB -#define G_SETCOMBINE 0xFC -#define G_SETTIMG 0xFD -#define G_SETZIMG 0xFE -#define G_SETCIMG 0xFF - -/* commands for s2dex */ -#if defined(F3DEX_GBI) -# define G_BG_1CYC 0x01 -# define G_BG_COPY 0x02 -# define G_OBJ_RECTANGLE 0x03 -# define G_OBJ_SPRITE 0x04 -# define G_OBJ_MOVEMEM 0x05 -# define G_SELECT_DL 0xB0 -# define G_OBJ_RENDERMODE 0xB1 -# define G_OBJ_RECTANGLE_R 0xB2 -# define G_OBJ_LOADTXTR 0xC1 -# define G_OBJ_LDTX_SPRITE 0xC2 -# define G_OBJ_LDTX_RECT 0xC3 -# define G_OBJ_LDTX_RECT_R 0xC4 -#endif - -/* commands for s2dex2 */ -#if defined(F3DEX_GBI_2) -# define G_OBJ_RECTANGLE 0x01 -# define G_OBJ_SPRITE 0x02 -# define G_SELECT_DL 0x04 -# define G_OBJ_LOADTXTR 0x05 -# define G_OBJ_LDTX_SPRITE 0x06 -# define G_OBJ_LDTX_RECT 0x07 -# define G_OBJ_LDTX_RECT_R 0x08 -# define G_BG_1CYC 0x09 -# define G_BG_COPY 0x0A -# define G_OBJ_RENDERMODE 0x0B -# define G_OBJ_RECTANGLE_R 0xDA -# define G_OBJ_MOVEMEM 0xDC -#endif - -/* commands for s2dex and s2dex2 */ -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define G_RDPHALF_0 0xE4 -#endif - -/* image formats */ -#define G_IM_FMT_RGBA 0 -#define G_IM_FMT_YUV 1 -#define G_IM_FMT_CI 2 -#define G_IM_FMT_IA 3 -#define G_IM_FMT_I 4 -#define G_IM_SIZ_4b 0 -#define G_IM_SIZ_8b 1 -#define G_IM_SIZ_16b 2 -#define G_IM_SIZ_32b 3 - -/* texture settings */ -#define G_TX_NOMIRROR (gI_(0b0) << 0) -#define G_TX_MIRROR (gI_(0b1) << 0) -#define G_TX_WRAP (gI_(0b0) << 1) -#define G_TX_CLAMP (gI_(0b1) << 1) -#define G_TX_NOMASK gI_(0) -#define G_TX_NOLOD gI_(0) -#define G_OFF gI_(0) -#define G_ON gI_(1) - -/* tile indices */ -#define G_TX_LOADTILE 7 -#define G_TX_RENDERTILE 0 - -/* loadblock constants */ -#define G_TX_DXT_FRAC 11 -#define G_TX_LDBLK_MAX_TXL 2047 - -/* geometry mode */ -#define G_ZBUFFER (gI_(0b1) << 0) -#define G_SHADE (gI_(0b1) << 2) -#define G_CULL_BOTH (G_CULL_FRONT | G_CULL_BACK) -#define G_FOG (gI_(0b1) << 16) -#define G_LIGHTING (gI_(0b1) << 17) -#define G_TEXTURE_GEN (gI_(0b1) << 18) -#define G_TEXTURE_GEN_LINEAR (gI_(0b1) << 19) -#define G_LOD (gI_(0b1) << 20) - -/* geometry mode for fast3d */ -#if defined(F3D_GBI) -# define G_CLIPPING (gI_(0b0) << 0) -#endif - -/* geometry mode for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_TEXTURE_ENABLE (gI_(0b1) << 1) -# define G_SHADING_SMOOTH (gI_(0b1) << 9) -# define G_CULL_FRONT (gI_(0b1) << 12) -# define G_CULL_BACK (gI_(0b1) << 13) -#endif - -/* geometry mode for f3dex and f3dex2 */ -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define G_CLIPPING (gI_(0b1) << 23) -#endif - -/* geometry mode for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_TEXTURE_ENABLE (gI_(0b0) << 0) -# define G_CULL_FRONT (gI_(0b1) << 9) -# define G_CULL_BACK (gI_(0b1) << 10) -# define G_SHADING_SMOOTH (gI_(0b1) << 21) -#endif - -/* othermode lo */ -#define G_MDSFT_ALPHACOMPARE 0 -#define G_MDSFT_ZSRCSEL 2 -#define G_MDSFT_RENDERMODE 3 -#define G_MDSFT_BLENDER 16 -#define G_MDSIZ_ALPHACOMPARE 2 -#define G_MDSIZ_ZSRCSEL 1 -#define G_MDSIZ_RENDERMODE 29 -#define G_MDSIZ_BLENDER 13 - -#define G_AC_NONE (gI_(0b00) << G_MDSFT_ALPHACOMPARE) -#define G_AC_THRESHOLD (gI_(0b01) << G_MDSFT_ALPHACOMPARE) -#define G_AC_DITHER (gI_(0b11) << G_MDSFT_ALPHACOMPARE) -#define G_ZS_PIXEL (gI_(0b0) << G_MDSFT_ZSRCSEL) -#define G_ZS_PRIM (gI_(0b1) << G_MDSFT_ZSRCSEL) -#define AA_EN (gI_(0b1) << (G_MDSFT_RENDERMODE + 0)) -#define Z_CMP (gI_(0b1) << (G_MDSFT_RENDERMODE + 1)) -#define Z_UPD (gI_(0b1) << (G_MDSFT_RENDERMODE + 2)) -#define IM_RD (gI_(0b1) << (G_MDSFT_RENDERMODE + 3)) -#define CLR_ON_CVG (gI_(0b1) << (G_MDSFT_RENDERMODE + 4)) -#define CVG_DST_CLAMP (gI_(0b00) << (G_MDSFT_RENDERMODE + 5)) -#define CVG_DST_WRAP (gI_(0b01) << (G_MDSFT_RENDERMODE + 5)) -#define CVG_DST_FULL (gI_(0b10) << (G_MDSFT_RENDERMODE + 5)) -#define CVG_DST_SAVE (gI_(0b11) << (G_MDSFT_RENDERMODE + 5)) -#define ZMODE_OPA (gI_(0b00) << (G_MDSFT_RENDERMODE + 7)) -#define ZMODE_INTER (gI_(0b01) << (G_MDSFT_RENDERMODE + 7)) -#define ZMODE_XLU (gI_(0b10) << (G_MDSFT_RENDERMODE + 7)) -#define ZMODE_DEC (gI_(0b11) << (G_MDSFT_RENDERMODE + 7)) -#define CVG_X_ALPHA (gI_(0b1) << (G_MDSFT_RENDERMODE + 9)) -#define ALPHA_CVG_SEL (gI_(0b1) << (G_MDSFT_RENDERMODE + 10)) -#define FORCE_BL (gI_(0b1) << (G_MDSFT_RENDERMODE + 11)) - -#define G_BL_1MA gI_(0b00) -#define G_BL_1 gI_(0b10) -#define G_BL_0 gI_(0b11) -#define G_BL_CLR_IN gI_(0b00) -#define G_BL_CLR_MEM gI_(0b01) -#define G_BL_CLR_BL gI_(0b10) -#define G_BL_CLR_FOG gI_(0b11) -#define G_BL_A_IN gI_(0b00) -#define G_BL_A_FOG gI_(0b01) -#define G_BL_A_MEM gI_(0b01) -#define G_BL_A_SHADE gI_(0b10) - -#define GBL_c1(p, a, m, b) \ - ( \ - gF_(p, 2, 30) | \ - gF_(a, 2, 26) | \ - gF_(m, 2, 22) | \ - gF_(b, 2, 18) \ - ) -#define GBL_c2(p, a, m, b) \ - ( \ - gF_(p, 2, 28) | \ - gF_(a, 2, 24) | \ - gF_(m, 2, 20) | \ - gF_(b, 2, 16) \ - ) - -/* render modes */ -#define G_RM_OPA_SURF \ - ( \ - CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_OPA_SURF2 \ - ( \ - CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_AA_OPA_SURF \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_OPA_SURF2 \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_OPA_SURF \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_OPA_SURF2 \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_ZB_OPA_SURF \ - ( \ - Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_ZB_OPA_SURF2 \ - ( \ - Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_OPA_SURF \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_OPA_SURF2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_SURF \ - ( \ - AA_EN | Z_CMP | Z_UPD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_SURF2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_XLU_SURF \ - ( \ - IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_XLU_SURF2 \ - ( \ - IM_RD | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_XLU_SURF \ - ( \ - AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | \ - FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_XLU_SURF2 \ - ( \ - AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | \ - FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_XLU_SURF \ - ( \ - Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_XLU | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_XLU_SURF2 \ - ( \ - Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_XLU | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_SURF \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_XLU | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_SURF2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_XLU | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_ZB_OPA_DECAL \ - ( \ - Z_CMP | CVG_DST_FULL | ZMODE_DEC | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_ZB_OPA_DECAL2 \ - ( \ - Z_CMP | CVG_DST_FULL | ZMODE_DEC | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_OPA_DECAL \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_WRAP | ZMODE_DEC | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_OPA_DECAL2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_WRAP | ZMODE_DEC | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_DECAL \ - ( \ - AA_EN | Z_CMP | CVG_DST_WRAP | ZMODE_DEC | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_DECAL2 \ - ( \ - AA_EN | Z_CMP | CVG_DST_WRAP | ZMODE_DEC | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_ZB_XLU_DECAL \ - ( \ - Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_DEC | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_XLU_DECAL2 \ - ( \ - Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_DEC | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_DECAL \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_DEC | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_DECAL2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_DEC | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_ZB_OPA_INTER \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_INTER | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_OPA_INTER2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_INTER | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_INTER \ - ( \ - AA_EN | Z_CMP | Z_UPD | CVG_DST_CLAMP | ZMODE_INTER | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_RA_ZB_OPA_INTER2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | CVG_DST_CLAMP | ZMODE_INTER | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_AA_ZB_XLU_INTER \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_INTER | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_INTER2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | \ - ZMODE_INTER | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_XLU_LINE \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_XLU_LINE2 \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_LINE \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_CLAMP | ZMODE_XLU | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_XLU_LINE2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_CLAMP | ZMODE_XLU | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_DEC_LINE \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_DEC_LINE2 \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_DEC_LINE \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_DEC | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_DEC_LINE2 \ - ( \ - AA_EN | Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_DEC | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - - -#define G_RM_TEX_EDGE \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_TEX_EDGE2 \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_AA_TEX_EDGE \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_TEX_EDGE2 \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_TEX_EDGE \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_TEX_EDGE2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_AA_ZB_TEX_INTER \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_INTER | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_TEX_INTER2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_INTER | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_AA_SUB_SURF \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_SUB_SURF2 \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_SUB_SURF \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) -#define G_RM_AA_ZB_SUB_SURF2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) \ - ) - -#define G_RM_PCL_SURF \ - ( \ - G_AC_DITHER | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_PCL_SURF2 \ - ( \ - G_AC_DITHER | CVG_DST_FULL | ZMODE_OPA | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_AA_PCL_SURF \ - ( \ - G_AC_DITHER | AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_PCL_SURF2 \ - ( \ - G_AC_DITHER | AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_PCL_SURF \ - ( \ - G_AC_DITHER | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_ZB_PCL_SURF2 \ - ( \ - G_AC_DITHER | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_AA_ZB_PCL_SURF \ - ( \ - G_AC_DITHER | AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | \ - ZMODE_OPA | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_PCL_SURF2 \ - ( \ - G_AC_DITHER | AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | \ - ZMODE_OPA | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_OPA_TERR \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_OPA_TERR2 \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_OPA_TERR \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_OPA_TERR2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_TEX_TERR \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_TEX_TERR2 \ - ( \ - AA_EN | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_TEX_TERR \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_TEX_TERR2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | \ - CVG_X_ALPHA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_AA_SUB_TERR \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_SUB_TERR2 \ - ( \ - AA_EN | IM_RD | CVG_DST_FULL | ZMODE_OPA | ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_SUB_TERR \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_ZB_SUB_TERR2 \ - ( \ - AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_CLD_SURF \ - ( \ - IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_CLD_SURF2 \ - ( \ - IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_CLD_SURF \ - ( \ - Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_CLD_SURF2 \ - ( \ - Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_XLU | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_ZB_OVL_SURF \ - ( \ - Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_DEC | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_ZB_OVL_SURF2 \ - ( \ - Z_CMP | IM_RD | CVG_DST_SAVE | ZMODE_DEC | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) - -#define G_RM_ADD \ - ( \ - IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_FOG, G_BL_CLR_MEM, G_BL_1) \ - ) -#define G_RM_ADD2 \ - ( \ - IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_FOG, G_BL_CLR_MEM, G_BL_1) \ - ) - -#define G_RM_FOG_SHADE_A \ - GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) - -#define G_RM_FOG_PRIM_A \ - GBL_c1(G_BL_CLR_FOG, G_BL_A_FOG, G_BL_CLR_IN, G_BL_1MA) - -#define G_RM_PASS \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) - -#define G_RM_VISCVG \ - ( \ - IM_RD | FORCE_BL | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_BL, G_BL_A_MEM) \ - ) -#define G_RM_VISCVG2 \ - ( \ - IM_RD | FORCE_BL | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_BL, G_BL_A_MEM) \ - ) - -#define G_RM_OPA_CI \ - ( \ - CVG_DST_CLAMP | ZMODE_OPA | \ - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) -#define G_RM_OPA_CI2 \ - ( \ - CVG_DST_CLAMP | ZMODE_OPA | \ - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) \ - ) - -#define G_RM_NOOP GBL_c1(0, 0, 0, 0) -#define G_RM_NOOP2 GBL_c2(0, 0, 0, 0) - -#define G_RM_SPRITE G_RM_OPA_SURF -#define G_RM_SPRITE2 G_RM_OPA_SURF2 -#define G_RM_RA_SPRITE \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_RA_SPRITE2 \ - ( \ - AA_EN | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | \ - ALPHA_CVG_SEL | \ - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) \ - ) -#define G_RM_AA_SPRITE G_RM_AA_TEX_TERR -#define G_RM_AA_SPRITE2 G_RM_AA_TEX_TERR2 -#define G_RM_XLU_SPRITE G_RM_XLU_SURF -#define G_RM_XLU_SPRITE2 G_RM_XLU_SURF2 -#define G_RM_AA_XLU_SPRITE G_RM_AA_XLU_SURF -#define G_RM_AA_XLU_SPRITE2 G_RM_AA_XLU_SURF2 - -#define G_OBJRM_NOTXCLAMP (gI_(0b1) << 0) -#define G_OBJRM_XLU (gI_(0b1) << 1) -#define G_OBJRM_ANTIALIAS (gI_(0b1) << 2) -#define G_OBJRM_BILERP (gI_(0b1) << 3) -#define G_OBJRM_SHRINKSIZE_1 (gI_(0b1) << 4) -#define G_OBJRM_SHRINKSIZE_2 (gI_(0b1) << 5) -#define G_OBJRM_WIDEN (gI_(0b1) << 6) - -/* othermode hi */ -#define G_MDSFT_ALPHADITHER 4 -#define G_MDSFT_RGBDITHER 6 -#define G_MDSFT_COMBKEY 8 -#define G_MDSFT_TEXTCONV 9 -#define G_MDSFT_TEXTFILT 12 -#define G_MDSFT_TEXTLUT 14 -#define G_MDSFT_TEXTLOD 16 -#define G_MDSFT_TEXTDETAIL 17 -#define G_MDSFT_TEXTPERSP 19 -#define G_MDSFT_CYCLETYPE 20 -#define G_MDSFT_PIPELINE 23 -#define G_MDSIZ_ALPHADITHER 2 -#define G_MDSIZ_RGBDITHER 2 -#define G_MDSIZ_COMBKEY 1 -#define G_MDSIZ_TEXTCONV 3 -#define G_MDSIZ_TEXTFILT 2 -#define G_MDSIZ_TEXTLUT 2 -#define G_MDSIZ_TEXTLOD 1 -#define G_MDSIZ_TEXTDETAIL 2 -#define G_MDSIZ_TEXTPERSP 1 -#define G_MDSIZ_CYCLETYPE 2 -#define G_MDSIZ_PIPELINE 1 - -#define G_AD_PATTERN (gI_(0b00) << G_MDSFT_ALPHADITHER) -#define G_AD_NOTPATTERN (gI_(0b01) << G_MDSFT_ALPHADITHER) -#define G_AD_NOISE (gI_(0b10) << G_MDSFT_ALPHADITHER) -#define G_AD_DISABLE (gI_(0b11) << G_MDSFT_ALPHADITHER) -#define G_CD_MAGICSQ (gI_(0b00) << G_MDSFT_RGBDITHER) -#define G_CD_BAYER (gI_(0b01) << G_MDSFT_RGBDITHER) -#define G_CD_NOISE (gI_(0b10) << G_MDSFT_RGBDITHER) -#define G_CD_DISABLE (gI_(0b11) << G_MDSFT_RGBDITHER) -#define G_CD_ENABLE (gI_(0b10) << G_MDSFT_RGBDITHER) -#define G_CK_NONE (gI_(0b0) << G_MDSFT_COMBKEY) -#define G_CK_KEY (gI_(0b1) << G_MDSFT_COMBKEY) -#define G_TC_CONV (gI_(0b000) << G_MDSFT_TEXTCONV) -#define G_TC_FILTCONV (gI_(0b101) << G_MDSFT_TEXTCONV) -#define G_TC_FILT (gI_(0b110) << G_MDSFT_TEXTCONV) -#define G_TF_POINT (gI_(0b00) << G_MDSFT_TEXTFILT) -#define G_TF_BILERP (gI_(0b10) << G_MDSFT_TEXTFILT) -#define G_TF_AVERAGE (gI_(0b11) << G_MDSFT_TEXTFILT) -#define G_TT_NONE (gI_(0b00) << G_MDSFT_TEXTLUT) -#define G_TT_RGBA16 (gI_(0b10) << G_MDSFT_TEXTLUT) -#define G_TT_IA16 (gI_(0b11) << G_MDSFT_TEXTLUT) -#define G_TL_TILE (gI_(0b0) << G_MDSFT_TEXTLOD) -#define G_TL_LOD (gI_(0b1) << G_MDSFT_TEXTLOD) -#define G_TD_CLAMP (gI_(0b00) << G_MDSFT_TEXTDETAIL) -#define G_TD_SHARPEN (gI_(0b01) << G_MDSFT_TEXTDETAIL) -#define G_TD_DETAIL (gI_(0b10) << G_MDSFT_TEXTDETAIL) -#define G_TP_NONE (gI_(0b0) << G_MDSFT_TEXTPERSP) -#define G_TP_PERSP (gI_(0b1) << G_MDSFT_TEXTPERSP) -#define G_CYC_1CYCLE (gI_(0b00) << G_MDSFT_CYCLETYPE) -#define G_CYC_2CYCLE (gI_(0b01) << G_MDSFT_CYCLETYPE) -#define G_CYC_COPY (gI_(0b10) << G_MDSFT_CYCLETYPE) -#define G_CYC_FILL (gI_(0b11) << G_MDSFT_CYCLETYPE) -#define G_PM_NPRIMITIVE (gI_(0b0) << G_MDSFT_PIPELINE) -#define G_PM_1PRIMITIVE (gI_(0b1) << G_MDSFT_PIPELINE) - -/* color conversion constants */ -#define G_CV_K0 (175) -#define G_CV_K1 (-43) -#define G_CV_K2 (-89) -#define G_CV_K3 (222) -#define G_CV_K4 (114) -#define G_CV_K5 (42) - -/* color combiner */ -#define G_CCMUX_COMBINED 0 -#define G_CCMUX_TEXEL0 1 -#define G_CCMUX_TEXEL1 2 -#define G_CCMUX_PRIMITIVE 3 -#define G_CCMUX_SHADE 4 -#define G_CCMUX_ENVIRONMENT 5 -#define G_CCMUX_1 6 -#define G_CCMUX_NOISE 7 -#define G_CCMUX_0 31 -#define G_CCMUX_CENTER 6 -#define G_CCMUX_K4 7 -#define G_CCMUX_SCALE 6 -#define G_CCMUX_COMBINED_ALPHA 7 -#define G_CCMUX_TEXEL0_ALPHA 8 -#define G_CCMUX_TEXEL1_ALPHA 9 -#define G_CCMUX_PRIMITIVE_ALPHA 10 -#define G_CCMUX_SHADE_ALPHA 11 -#define G_CCMUX_ENV_ALPHA 12 -#define G_CCMUX_LOD_FRACTION 13 -#define G_CCMUX_PRIM_LOD_FRAC 14 -#define G_CCMUX_K5 15 -#define G_ACMUX_COMBINED 0 -#define G_ACMUX_TEXEL0 1 -#define G_ACMUX_TEXEL1 2 -#define G_ACMUX_PRIMITIVE 3 -#define G_ACMUX_SHADE 4 -#define G_ACMUX_ENVIRONMENT 5 -#define G_ACMUX_1 6 -#define G_ACMUX_0 7 -#define G_ACMUX_LOD_FRACTION 0 -#define G_ACMUX_PRIM_LOD_FRAC 6 - -/* - * combine modes - * ( A - B ) * C + D -*/ -#define G_CC_MODULATEI \ - TEXEL0, 0, SHADE, 0, \ - 0, 0, 0, SHADE -#define G_CC_MODULATEIA \ - TEXEL0, 0, SHADE, 0, \ - TEXEL0, 0, SHADE, 0 -#define G_CC_MODULATEIDECALA \ - TEXEL0, 0, SHADE, 0, \ - 0, 0, 0, TEXEL0 -#define G_CC_MODULATERGB \ - G_CC_MODULATEI -#define G_CC_MODULATERGBA \ - G_CC_MODULATEIA -#define G_CC_MODULATERGBDECALA \ - G_CC_MODULATEIDECALA -#define G_CC_MODULATEI_PRIM \ - TEXEL0, 0, PRIMITIVE, 0, \ - 0, 0, 0, PRIMITIVE -#define G_CC_MODULATEIA_PRIM \ - TEXEL0, 0, PRIMITIVE, 0, \ - TEXEL0, 0, PRIMITIVE, 0 -#define G_CC_MODULATEIDECALA_PRIM \ - TEXEL0, 0, PRIMITIVE, 0, \ - 0, 0, 0, TEXEL0 -#define G_CC_MODULATERGB_PRIM \ - G_CC_MODULATEI_PRIM -#define G_CC_MODULATERGBA_PRIM \ - G_CC_MODULATEIA_PRIM -#define G_CC_MODULATERGBDECALA_PRIM \ - G_CC_MODULATEIDECALA_PRIM -#define G_CC_DECALRGB \ - 0, 0, 0, TEXEL0, \ - 0, 0, 0, SHADE -#define G_CC_DECALRGBA \ - 0, 0, 0, TEXEL0, \ - 0, 0, 0, TEXEL0 -#define G_CC_BLENDI \ - ENVIRONMENT, SHADE, TEXEL0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_BLENDIA \ - ENVIRONMENT, SHADE, TEXEL0, SHADE, \ - TEXEL0, 0, SHADE, 0 -#define G_CC_BLENDIDECALA \ - ENVIRONMENT, SHADE, TEXEL0, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_BLENDRGBA \ - TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_BLENDRGBDECALA \ - TEXEL0, SHADE, TEXEL0_ALPHA, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_REFLECTRGB \ - ENVIRONMENT, 0, TEXEL0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_REFLECTRGBDECALA \ - ENVIRONMENT, 0, TEXEL0, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_HILITERGB \ - PRIMITIVE, SHADE, TEXEL0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_HILITERGBA \ - PRIMITIVE, SHADE, TEXEL0, SHADE, \ - PRIMITIVE, SHADE, TEXEL0, SHADE -#define G_CC_HILITERGBDECALA \ - PRIMITIVE, SHADE, TEXEL0, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_1CYUV2RGB \ - TEXEL0, K4, K5, TEXEL0, \ - 0, 0, 0, SHADE -#define G_CC_PRIMITIVE \ - 0, 0, 0, PRIMITIVE, \ - 0, 0, 0, PRIMITIVE -#define G_CC_SHADE \ - 0, 0, 0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_ADDRGB \ - 1, 0, TEXEL0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_ADDRGBDECALA \ - 1, 0, TEXEL0, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_SHADEDECALA \ - 0, 0, 0, SHADE, \ - 0, 0, 0, TEXEL0 -#define G_CC_BLENDPE \ - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, \ - TEXEL0, 0, SHADE, 0 -#define G_CC_BLENDPEDECALA \ - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, \ - 0, 0, 0, TEXEL0 -#define G_CC_TRILERP \ - TEXEL1, TEXEL0, LOD_FRACTION, TEXEL0, \ - TEXEL1, TEXEL0, LOD_FRACTION, TEXEL0 -#define G_CC_TEMPLERP \ - TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, \ - TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0 -#define G_CC_INTERFERENCE \ - TEXEL0, 0, TEXEL1, 0, \ - TEXEL0, 0, TEXEL1, 0 -#define _G_CC_BLENDPE \ - ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, \ - TEXEL0, 0, SHADE, 0 -#define _G_CC_BLENDPEDECALA \ - ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, \ - 0, 0, 0, TEXEL0 -#define _G_CC_SPARSEST \ - PRIMITIVE, TEXEL0, LOD_FRACTION, TEXEL0, \ - PRIMITIVE, TEXEL0, LOD_FRACTION, TEXEL0 -#define _G_CC_TWOCOLORTEX \ - PRIMITIVE, SHADE, TEXEL0, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_MODULATEI2 \ - COMBINED, 0, SHADE, 0, \ - 0, 0, 0, SHADE -#define G_CC_MODULATEIA2 \ - COMBINED, 0, SHADE, 0, \ - COMBINED, 0, SHADE, 0 -#define G_CC_MODULATERGB2 \ - G_CC_MODULATEI2 -#define G_CC_MODULATERGBA2 \ - G_CC_MODULATEIA2 -#define G_CC_MODULATEI_PRIM2 \ - COMBINED, 0, PRIMITIVE, 0, \ - 0, 0, 0, PRIMITIVE -#define G_CC_MODULATEIA_PRIM2 \ - COMBINED, 0, PRIMITIVE, 0, \ - COMBINED, 0, PRIMITIVE, 0 -#define G_CC_MODULATERGB_PRIM2 \ - G_CC_MODULATEI_PRIM2 -#define G_CC_MODULATERGBA_PRIM2 \ - G_CC_MODULATEIA_PRIM2 -#define G_CC_DECALRGB2 \ - 0, 0, 0, COMBINED, \ - 0, 0, 0, SHADE -#define G_CC_BLENDI2 \ - ENVIRONMENT, SHADE, COMBINED, SHADE, \ - 0, 0, 0, SHADE -#define G_CC_BLENDIA2 \ - ENVIRONMENT, SHADE, COMBINED, SHADE, \ - COMBINED, 0, SHADE, 0 -#define G_CC_HILITERGB2 \ - ENVIRONMENT, COMBINED, TEXEL0, COMBINED, \ - 0, 0, 0, SHADE -#define G_CC_HILITERGBA2 \ - ENVIRONMENT, COMBINED, TEXEL0, COMBINED, \ - ENVIRONMENT, COMBINED, TEXEL0, COMBINED -#define G_CC_HILITERGBDECALA2 \ - ENVIRONMENT, COMBINED, TEXEL0, COMBINED, \ - 0, 0, 0, TEXEL0 -#define G_CC_HILITERGBPASSA2 \ - ENVIRONMENT, COMBINED, TEXEL0, COMBINED, \ - 0, 0, 0, COMBINED -#define G_CC_CHROMA_KEY2 \ - TEXEL0, CENTER, SCALE, 0, \ - 0, 0, 0, 0 -#define G_CC_YUV2RGB \ - TEXEL1, K4, K5, TEXEL1, \ - 0, 0, 0, 0 -#define G_CC_PASS2 \ - 0, 0, 0, COMBINED, \ - 0, 0, 0, COMBINED -#define G_CC_LERP(a0, b0, c0, d0, Aa0, Ab0, Ac0, Ad0, \ - a1, b1, c1, d1, Aa1, Ab1, Ac1, Ad1) \ - ( \ - gFL_(G_CCMUX_##a0, 4, 52) | \ - gFL_(G_CCMUX_##c0, 5, 47) | \ - gFL_(G_ACMUX_##Aa0, 3, 44) | \ - gFL_(G_ACMUX_##Ac0, 3, 41) | \ - gFL_(G_CCMUX_##a1, 4, 37) | \ - gFL_(G_CCMUX_##c1, 5, 32) | \ - gFL_(G_CCMUX_##b0, 4, 28) | \ - gFL_(G_CCMUX_##b1, 4, 24) | \ - gFL_(G_ACMUX_##Aa1, 3, 21) | \ - gFL_(G_ACMUX_##Ac1, 3, 18) | \ - gFL_(G_CCMUX_##d0, 3, 15) | \ - gFL_(G_ACMUX_##Ab0, 3, 12) | \ - gFL_(G_ACMUX_##Ad0, 3, 9) | \ - gFL_(G_CCMUX_##d1, 3, 6) | \ - gFL_(G_ACMUX_##Ab1, 3, 3) | \ - gFL_(G_ACMUX_##Ad1, 3, 0) \ - ) -#define G_CC_MODE(mode1, mode2) G_CC_LERP(mode1, mode2) - -/* scissor modes */ -#define G_SC_NON_INTERLACE gI_(0b00) -#define G_SC_EVEN_INTERLACE gI_(0b10) -#define G_SC_ODD_INTERLACE gI_(0b11) - -/* display list branch flags */ -#define G_DL_PUSH gI_(0b0) -#define G_DL_NOPUSH gI_(0b1) - -/* conditional branching flags (f3dex and f3dex2) */ -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define G_BZ_PERSP 0 -# define G_BZ_ORTHO 1 -#endif - -/* matrix params */ -#define G_MTX_MUL (gI_(0b0) << 1) -#define G_MTX_LOAD (gI_(0b1) << 1) - -/* matrix params for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_MTX_MODELVIEW (gI_(0b0) << 0) -# define G_MTX_PROJECTION (gI_(0b1) << 0) -# define G_MTX_NOPUSH (gI_(0b0) << 2) -# define G_MTX_PUSH (gI_(0b1) << 2) -#endif - -/* matrix params for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_MTX_NOPUSH (gI_(0b0) << 0) -# define G_MTX_PUSH (gI_(0b1) << 0) -# define G_MTX_MODELVIEW (gI_(0b0) << 2) -# define G_MTX_PROJECTION (gI_(0b1) << 2) -#endif - -/* moveword indices */ -#define G_MW_MATRIX 0 -#define G_MW_NUMLIGHT 2 -#define G_MW_CLIP 4 -#define G_MW_SEGMENT 6 -#define G_MW_FOG 8 -#define G_MW_GENSTAT 8 -#define G_MW_LIGHTCOL 10 -#define G_MW_PERSPNORM 14 - -/* moveword indices for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_MW_POINTS 12 -#endif - -/* moveword indices for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_MW_FORCEMTX 12 -#endif - -/* moveword offsets */ -#define G_MWO_NUMLIGHT gI_(0x00) -#define G_MWO_CLIP_RNX gI_(0x04) -#define G_MWO_CLIP_RNY gI_(0x0C) -#define G_MWO_CLIP_RPX gI_(0x14) -#define G_MWO_CLIP_RPY gI_(0x1C) -#define G_MWO_SEGMENT_0 gI_(0x00) -#define G_MWO_SEGMENT_1 gI_(0x04) -#define G_MWO_SEGMENT_2 gI_(0x08) -#define G_MWO_SEGMENT_3 gI_(0x0C) -#define G_MWO_SEGMENT_4 gI_(0x10) -#define G_MWO_SEGMENT_5 gI_(0x14) -#define G_MWO_SEGMENT_6 gI_(0x18) -#define G_MWO_SEGMENT_7 gI_(0x1C) -#define G_MWO_SEGMENT_8 gI_(0x20) -#define G_MWO_SEGMENT_9 gI_(0x24) -#define G_MWO_SEGMENT_A gI_(0x28) -#define G_MWO_SEGMENT_B gI_(0x2C) -#define G_MWO_SEGMENT_C gI_(0x30) -#define G_MWO_SEGMENT_D gI_(0x34) -#define G_MWO_SEGMENT_E gI_(0x38) -#define G_MWO_SEGMENT_F gI_(0x3C) -#define G_MWO_FOG gI_(0x00) -#define G_MWO_aLIGHT_1 gI_(0x00) -#define G_MWO_bLIGHT_1 gI_(0x04) -#define G_MWO_MATRIX_XX_XY_I gI_(0x00) -#define G_MWO_MATRIX_XZ_XW_I gI_(0x04) -#define G_MWO_MATRIX_YX_YY_I gI_(0x08) -#define G_MWO_MATRIX_YZ_YW_I gI_(0x0C) -#define G_MWO_MATRIX_ZX_ZY_I gI_(0x10) -#define G_MWO_MATRIX_ZZ_ZW_I gI_(0x14) -#define G_MWO_MATRIX_WX_WY_I gI_(0x18) -#define G_MWO_MATRIX_WZ_WW_I gI_(0x1C) -#define G_MWO_MATRIX_XX_XY_F gI_(0x20) -#define G_MWO_MATRIX_XZ_XW_F gI_(0x24) -#define G_MWO_MATRIX_YX_YY_F gI_(0x28) -#define G_MWO_MATRIX_YZ_YW_F gI_(0x2C) -#define G_MWO_MATRIX_ZX_ZY_F gI_(0x30) -#define G_MWO_MATRIX_ZZ_ZW_F gI_(0x34) -#define G_MWO_MATRIX_WX_WY_F gI_(0x38) -#define G_MWO_MATRIX_WZ_WW_F gI_(0x3C) -#define G_MWO_POINT_RGBA gI_(0x10) -#define G_MWO_POINT_ST gI_(0x14) -#define G_MWO_POINT_XYSCREEN gI_(0x18) -#define G_MWO_POINT_ZSCREEN gI_(0x1C) - -/* moveword offsets for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_MWO_aLIGHT_2 gI_(0x20) -# define G_MWO_bLIGHT_2 gI_(0x24) -# define G_MWO_aLIGHT_3 gI_(0x40) -# define G_MWO_bLIGHT_3 gI_(0x44) -# define G_MWO_aLIGHT_4 gI_(0x60) -# define G_MWO_bLIGHT_4 gI_(0x64) -# define G_MWO_aLIGHT_5 gI_(0x80) -# define G_MWO_bLIGHT_5 gI_(0x84) -# define G_MWO_aLIGHT_6 gI_(0xA0) -# define G_MWO_bLIGHT_6 gI_(0xA4) -# define G_MWO_aLIGHT_7 gI_(0xC0) -# define G_MWO_bLIGHT_7 gI_(0xC4) -# define G_MWO_aLIGHT_8 gI_(0xE0) -# define G_MWO_bLIGHT_8 gI_(0xE4) -#endif - -/* moveword offsets for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_MWO_aLIGHT_2 gI_(0x18) -# define G_MWO_bLIGHT_2 gI_(0x1C) -# define G_MWO_aLIGHT_3 gI_(0x30) -# define G_MWO_bLIGHT_3 gI_(0x34) -# define G_MWO_aLIGHT_4 gI_(0x48) -# define G_MWO_bLIGHT_4 gI_(0x4C) -# define G_MWO_aLIGHT_5 gI_(0x60) -# define G_MWO_bLIGHT_5 gI_(0x64) -# define G_MWO_aLIGHT_6 gI_(0x78) -# define G_MWO_bLIGHT_6 gI_(0x7C) -# define G_MWO_aLIGHT_7 gI_(0x90) -# define G_MWO_bLIGHT_7 gI_(0x94) -# define G_MWO_aLIGHT_8 gI_(0xA8) -# define G_MWO_bLIGHT_8 gI_(0xAC) -#endif - -/* movemem params for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define G_MV_VIEWPORT 128 -# define G_MV_LOOKATY 130 -# define G_MV_LOOKATX 132 -# define G_MV_L0 134 -# define G_MV_L1 136 -# define G_MV_L2 138 -# define G_MV_L3 140 -# define G_MV_L4 142 -# define G_MV_L5 144 -# define G_MV_L6 146 -# define G_MV_L7 148 -# define G_MV_TXTATT 150 -# define G_MV_MATRIX_2 152 -# define G_MV_MATRIX_3 154 -# define G_MV_MATRIX_4 156 -# define G_MV_MATRIX_1 158 -#endif - -/* movemem params for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define G_MV_MMTX 2 -# define G_MV_PMTX 6 -# define G_MV_VIEWPORT 8 -# define G_MV_LIGHT 10 -# define G_MV_POINT 12 -# define G_MV_MATRIX 14 -# define G_MVO_LOOKATX gI_(0 * 0x18) -# define G_MVO_LOOKATY gI_(1 * 0x18) -# define G_MVO_L0 gI_(2 * 0x18) -# define G_MVO_L1 gI_(3 * 0x18) -# define G_MVO_L2 gI_(4 * 0x18) -# define G_MVO_L3 gI_(5 * 0x18) -# define G_MVO_L4 gI_(6 * 0x18) -# define G_MVO_L5 gI_(7 * 0x18) -# define G_MVO_L6 gI_(8 * 0x18) -# define G_MVO_L7 gI_(9 * 0x18) -#endif - -/* frustum ratios */ -#define FRUSTRATIO_1 gI_(1) -#define FRUSTRATIO_2 gI_(2) -#define FRUSTRATIO_3 gI_(3) -#define FRUSTRATIO_4 gI_(4) -#define FRUSTRATIO_5 gI_(5) -#define FRUSTRATIO_6 gI_(6) - -/* light params */ -#define NUMLIGHTS_0 1 -#define NUMLIGHTS_1 1 -#define NUMLIGHTS_2 2 -#define NUMLIGHTS_3 3 -#define NUMLIGHTS_4 4 -#define NUMLIGHTS_5 5 -#define NUMLIGHTS_6 6 -#define NUMLIGHTS_7 7 -#define LIGHT_1 1 -#define LIGHT_2 2 -#define LIGHT_3 3 -#define LIGHT_4 4 -#define LIGHT_5 5 -#define LIGHT_6 6 -#define LIGHT_7 7 -#define LIGHT_8 8 - -/* light params for fast3d and f3dex */ -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define NUML(n) (((n) + 1) * 32 + 0x80000000) -#endif - -/* light params for f3dex2 */ -#if defined(F3DEX_GBI_2) -# define NUML(n) ((n) * 0x18) -#endif - -/* background load types */ -#define G_BGLT_LOADBLOCK gI_(0x0033) -#define G_BGLT_LOADTILE gI_(0xFFF4) - -/* background flags */ -#define G_BG_FLAG_FLIPS (gI_(0b1) << 0) -#define G_BG_FLAG_FLIPT (gI_(0b1) << 1) - -/* object load types */ -#define G_OBJLT_TXTRBLOCK gI_(0x00001033) -#define G_OBJLT_TXTRTILE gI_(0x00FC1034) -#define G_OBJLT_TLUT gI_(0x00000030) - -/* object flags */ -#define G_OBJ_FLAG_FLIPS (gI_(0b1) << 0) -#define G_OBJ_FLAG_FLIPT (gI_(0b1) << 4) - -/* color macros */ -#define G_MAXZ 0x03FF -#define G_MAXFBZ 0x3FFF -#define GPACK_RGBA5551(r, g, b, a) \ - ( \ - gF_(r, 5, 11) | \ - gF_(g, 5, 6) | \ - gF_(b, 5, 1) | \ - gF_(a, 1, 0) \ - ) -#define GPACK_RGBA8888(r, g, b, a) \ - ( \ - gF_(r, 8, 24) | \ - gF_(g, 8, 16) | \ - gF_(b, 8, 8) | \ - gF_(a, 8, 0) \ - ) -#define GPACK_RGB24A8(rgb, a) (gF_(rgb, 24, 8) | gF_(a, 8, 0)) -#define GPACK_ZDZ(z, dz) (gF_(z, 14, 2) | gF_(dz, 2, 0)) - -/* structure definition macros */ -#define gdSPDefMtx(xx, xy, xz, xw, \ - yx, yy, yz, yw, \ - zx, zy, zz, zw, \ - wx, wy, wz, ww) \ - ( \ - (Mtx) \ - { \ - .i = \ - { \ - (qs1616(xx) >> 16) & 0xFFFF, \ - (qs1616(xy) >> 16) & 0xFFFF, \ - (qs1616(xz) >> 16) & 0xFFFF, \ - (qs1616(xw) >> 16) & 0xFFFF, \ - (qs1616(yx) >> 16) & 0xFFFF, \ - (qs1616(yy) >> 16) & 0xFFFF, \ - (qs1616(yz) >> 16) & 0xFFFF, \ - (qs1616(yw) >> 16) & 0xFFFF, \ - (qs1616(zx) >> 16) & 0xFFFF, \ - (qs1616(zy) >> 16) & 0xFFFF, \ - (qs1616(zz) >> 16) & 0xFFFF, \ - (qs1616(zw) >> 16) & 0xFFFF, \ - (qs1616(wx) >> 16) & 0xFFFF, \ - (qs1616(wy) >> 16) & 0xFFFF, \ - (qs1616(wz) >> 16) & 0xFFFF, \ - (qs1616(ww) >> 16) & 0xFFFF, \ - }, \ - .f = \ - { \ - qs1616(xx) & 0xFFFF, \ - qs1616(xy) & 0xFFFF, \ - qs1616(xz) & 0xFFFF, \ - qs1616(xw) & 0xFFFF, \ - qs1616(yx) & 0xFFFF, \ - qs1616(yy) & 0xFFFF, \ - qs1616(yz) & 0xFFFF, \ - qs1616(yw) & 0xFFFF, \ - qs1616(zx) & 0xFFFF, \ - qs1616(zy) & 0xFFFF, \ - qs1616(zz) & 0xFFFF, \ - qs1616(zw) & 0xFFFF, \ - qs1616(wx) & 0xFFFF, \ - qs1616(wy) & 0xFFFF, \ - qs1616(wz) & 0xFFFF, \ - qs1616(ww) & 0xFFFF, \ - } \ - } \ - ) -#define gdSPDefLookAt(rx, ry, rz, ux, uy, uz) \ - ( \ - (LookAt) \ - { \ - .l[0].l = \ - { \ - .col = {0, 0, 0}, \ - .colc = {0, 0, 0}, \ - .dir = {rx, ry, rz}, \ - }, \ - .l[1].l = \ - { \ - .col = {0, 0x80, 0}, \ - .colc = {0, 0x80, 0}, \ - .dir = {ux, uy, uz}, \ - }, \ - } \ - ) -#define gdSPDefLights0(ar, ag, ab) \ - ( \ - (Lights0) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - } \ - } \ - ) -#define gdSPDefLights1(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1) \ - ( \ - (Lights1) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - } \ - ) -#define gdSPDefLights2(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2) \ - ( \ - (Lights2) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - } \ - ) -#define gdSPDefLights3(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2, \ - r3, g3, b3, x3, y3, z3) \ - ( \ - (Lights3) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - .l[2].l = \ - { \ - .col = {r3, g3, b3}, \ - .colc = {r3, g3, b3}, \ - .dir = {x3, y3, z3}, \ - } \ - } \ - ) -#define gdSPDefLights4(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2, \ - r3, g3, b3, x3, y3, z3, \ - r4, g4, b4, x4, y4, z4) \ - ( \ - (Lights4) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - .l[2].l = \ - { \ - .col = {r3, g3, b3}, \ - .colc = {r3, g3, b3}, \ - .dir = {x3, y3, z3}, \ - } \ - .l[3].l = \ - { \ - .col = {r4, g4, b4}, \ - .colc = {r4, g4, b4}, \ - .dir = {x4, y4, z4}, \ - } \ - } \ - ) -#define gdSPDefLights5(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2, \ - r3, g3, b3, x3, y3, z3, \ - r4, g4, b4, x4, y4, z4, \ - r5, g5, b5, x5, y5, z5) \ - ( \ - (Lights5) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - .l[2].l = \ - { \ - .col = {r3, g3, b3}, \ - .colc = {r3, g3, b3}, \ - .dir = {x3, y3, z3}, \ - } \ - .l[3].l = \ - { \ - .col = {r4, g4, b4}, \ - .colc = {r4, g4, b4}, \ - .dir = {x4, y4, z4}, \ - } \ - .l[4].l = \ - { \ - .col = {r5, g5, b5}, \ - .colc = {r5, g5, b5}, \ - .dir = {x5, y5, z5}, \ - } \ - } \ - ) -#define gdSPDefLights6(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2, \ - r3, g3, b3, x3, y3, z3, \ - r4, g4, b4, x4, y4, z4, \ - r5, g5, b5, x5, y5, z5, \ - r6, g6, b6, x6, y6, z6)\ - ( \ - (Lights6) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - .l[2].l = \ - { \ - .col = {r3, g3, b3}, \ - .colc = {r3, g3, b3}, \ - .dir = {x3, y3, z3}, \ - } \ - .l[3].l = \ - { \ - .col = {r4, g4, b4}, \ - .colc = {r4, g4, b4}, \ - .dir = {x4, y4, z4}, \ - } \ - .l[4].l = \ - { \ - .col = {r5, g5, b5}, \ - .colc = {r5, g5, b5}, \ - .dir = {x5, y5, z5}, \ - } \ - .l[5].l = \ - { \ - .col = {r6, g6, b6}, \ - .colc = {r6, g6, b6}, \ - .dir = {x6, y6, z6}, \ - } \ - } \ - ) -#define gdSPDefLights7(ar, ag, ab, \ - r1, g1, b1, x1, y1, z1, \ - r2, g2, b2, x2, y2, z2, \ - r3, g3, b3, x3, y3, z3, \ - r4, g4, b4, x4, y4, z4, \ - r5, g5, b5, x5, y5, z5, \ - r6, g6, b6, x6, y6, z6, \ - r7, g7, b7, x7, y7, z7) \ - ( \ - (Lights7) \ - { \ - .a.l = \ - { \ - .col = {ar, ag, ab}, \ - .colc = {ar, ag, ab}, \ - }, \ - .l[0].l = \ - { \ - .col = {r1, g1, b1}, \ - .colc = {r1, g1, b1}, \ - .dir = {x1, y1, z1}, \ - } \ - .l[1].l = \ - { \ - .col = {r2, g2, b2}, \ - .colc = {r2, g2, b2}, \ - .dir = {x2, y2, z2}, \ - } \ - .l[2].l = \ - { \ - .col = {r3, g3, b3}, \ - .colc = {r3, g3, b3}, \ - .dir = {x3, y3, z3}, \ - } \ - .l[3].l = \ - { \ - .col = {r4, g4, b4}, \ - .colc = {r4, g4, b4}, \ - .dir = {x4, y4, z4}, \ - } \ - .l[4].l = \ - { \ - .col = {r5, g5, b5}, \ - .colc = {r5, g5, b5}, \ - .dir = {x5, y5, z5}, \ - } \ - .l[5].l = \ - { \ - .col = {r6, g6, b6}, \ - .colc = {r6, g6, b6}, \ - .dir = {x6, y6, z6}, \ - } \ - .l[6].l = \ - { \ - .col = {r7, g7, b7}, \ - .colc = {r7, g7, b7}, \ - .dir = {x7, y7, z7}, \ - } \ - } \ - ) -#define gdSPDefVtx(x, y, z, s, t) \ - ( \ - (Vtx) \ - { \ - .v = \ - { \ - .ob = {x, y, z}, \ - .tc = {qs105(s), qs105(t)}, \ - } \ - } \ - ) -#define gdSPDefVtxC(x, y, z, s, t, cr, cg, cb, ca) \ - ( \ - (Vtx) \ - { \ - .v = \ - { \ - .ob = {x, y, z}, \ - .tc = {qs105(s), qs105(t)}, \ - .cn = {cr, cg, cb, ca}, \ - } \ - } \ - ) -#define gdSPDefVtxN(x, y, z, s, t, nx, ny, nz, ca) \ - ( \ - (Vtx) \ - { \ - .n = \ - { \ - .ob = {x, y, z}, \ - .tc = {qs105(s), qs105(t)}, \ - .n = {nx, ny, nz}, \ - .a = ca \ - } \ - } \ - ) - -/* instruction macros */ - -#define gsDPFillRectangle(ulx, uly, lrx, lry) \ - gO_( \ - G_FILLRECT, \ - gF_(lrx, 10, 14) | \ - gF_(lry, 10, 2), \ - gF_(ulx, 10, 14) | \ - gF_(uly, 10, 2)) - -#define gsDPScisFillRectangle(ulx, uly, lrx, lry) \ - gsDPFillRectangle(gScC_(ulx), gScC_(uly), gScC_(lrx), gScC_(lry)) - -#define gsDPFullSync() \ - gO_(G_RDPFULLSYNC, 0, 0) - -#define gsDPLoadSync() \ - gO_(G_RDPLOADSYNC, 0, 0) - -#define gsDPTileSync() \ - gO_(G_RDPTILESYNC, 0, 0) - -#define gsDPPipeSync() \ - gO_(G_RDPPIPESYNC, 0, 0) - -#define gsDPLoadTLUT_pal16(pal, dram) \ - gsDPLoadTLUT(16, 256 + (gI_(pal) & 0xF) * 16, dram) - -#define gsDPLoadTLUT_pal256(dram) \ - gsDPLoadTLUT(256, 256, dram) - -#define gLTB_(timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - dxt, tmem, rt, line) \ - gsDPSetTextureImage(fmt, G_SIZ_LDSIZ(siz), 1, timg), \ - gsDPSetTile( \ - fmt, G_SIZ_LDSIZ(siz), 0, tmem, G_TX_LOADTILE, 0, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPLoadSync(), \ - gsDPLoadBlock( \ - G_TX_LOADTILE, 0, 0, \ - G_LTB_LRS(width, height, siz), \ - dxt), \ - gsDPPipeSync(), \ - gsDPSetTile( \ - fmt, siz, line, tmem, rt, pal, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPSetTileSize(rt, 0, 0, qu102((width) - 1), qu102((height) - 1)) - -#define gsDPLoadTextureBlock(timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), 0x0, G_TX_RENDERTILE, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadTextureBlockS(timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, 0x0, G_TX_RENDERTILE, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadTextureBlock_4b(timg, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(G_IM_SIZ_4b, width), 0x0, G_TX_RENDERTILE, \ - ((width) * 4 + 63) / 64) - -#define gsDPLoadTextureBlock_4bS(timg, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, 0x0, G_TX_RENDERTILE, \ - ((width) * 4 + 63) / 64) - -#define gsDPLoadTextureBlockYuv(timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), 0x0, G_TX_RENDERTILE, \ - ((width) + 7) / 8) - -#define gsDPLoadTextureBlockYuvS(timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, 0x0, G_TX_RENDERTILE, \ - ((width) + 7) / 8) - -#define _gsDPLoadTextureBlock(timg, tmem, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), tmem, G_TX_RENDERTILE, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define _gsDPLoadTextureBlockS(timg, tmem, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, G_TX_RENDERTILE, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define _gsDPLoadTextureBlock_4b(timg, tmem, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(G_IM_SIZ_4b, width), tmem, G_TX_RENDERTILE, \ - ((width) * 4 + 63) / 64) - -#define _gsDPLoadTextureBlock_4bS(timg, tmem, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, G_TX_RENDERTILE, \ - ((width) * 4 + 63) / 64) - -#define _gsDPLoadTextureBlockYuv(timg, tmem, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), tmem, G_TX_RENDERTILE, \ - ((width) + 7) / 8) - -#define _gsDPLoadTextureBlockYuvS(timg, tmem, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, G_TX_RENDERTILE, \ - ((width) + 7) / 8) - -#define gsDPLoadMultiBlock(timg, tmem, rt, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), tmem, rt, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadMultiBlockS(timg, tmem, rt, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, rt, \ - ((width) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadMultiBlock_4b(timg, tmem, rt, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(G_IM_SIZ_4b, width), tmem, rt, \ - ((width) * 4 + 63) / 64) - -#define gsDPLoadMultiBlock_4bS(timg, tmem, rt, fmt, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, G_IM_SIZ_4b, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, rt, \ - ((width) * 4 + 63) / 64) - -#define gsDPLoadMultiBlockYuv(timg, tmem, rt, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - G_DXT(siz, width), tmem, rt, \ - ((width) + 7) / 8) - -#define gsDPLoadMultiBlockYuvS(timg, tmem, rt, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTB_( \ - timg, fmt, siz, width, height, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0, tmem, rt, \ - ((width) + 7) / 8) - -#define gLTT_(timg, fmt, siz, width, height, uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, rt, line) \ - gsDPSetTextureImage(fmt, siz, width, timg), \ - gsDPSetTile( \ - fmt, siz, line, tmem, \ - G_TX_LOADTILE, 0, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPLoadSync(), \ - gsDPLoadTile( \ - G_TX_LOADTILE, \ - qu102(uls), qu102(ult), \ - qu102(lrs), qu102(lrt)), \ - gsDPPipeSync(), \ - gsDPSetTile( \ - fmt, siz, line, \ - tmem, rt, pal, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPSetTileSize( \ - rt, \ - qu102(uls), qu102(ult), \ - qu102(lrs), qu102(lrt)) - -#define gLTT4_(timg, fmt, width, height, uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, rt) \ - gsDPSetTextureImage(fmt, G_IM_SIZ_8b, (width) / 2, timg), \ - gsDPSetTile( \ - fmt, G_IM_SIZ_8b, \ - (((lrs) - (uls) + 1) / 2 + 7) / 8, \ - tmem, G_TX_LOADTILE, 0, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPLoadSync(), \ - gsDPLoadTile( \ - G_TX_LOADTILE, \ - qu102(uls) / 2, qu102(ult), \ - qu102(lrs) / 2, qu102(lrt)), \ - gsDPPipeSync(), \ - gsDPSetTile( \ - fmt, G_IM_SIZ_4b, \ - (((lrs) - (uls) + 1) / 2 + 7) / 8, \ - tmem, rt, pal, \ - cmt, maskt, shiftt, \ - cms, masks, shifts), \ - gsDPSetTileSize( \ - rt, \ - qu102(uls), qu102(ult), \ - qu102(lrs), qu102(lrt)) - -#define gsDPLoadTextureTile(timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0x0, G_TX_RENDERTILE, \ - (((lrs) - (uls) + 1) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadTextureTile_4b(timg, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT4_( \ - timg, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0x0, G_TX_RENDERTILE) - -#define gsDPLoadTextureTileYuv(timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - 0x0, G_TX_RENDERTILE, \ - (((lrs) - (uls) + 1) + 7) / 8) - -#define _gsDPLoadTextureTile(timg, tmem, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, G_TX_RENDERTILE, \ - (((lrs) - (uls) + 1) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define _gsDPLoadTextureTile_4b(timg, tmem, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT4_( \ - timg, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, G_TX_RENDERTILE) - -#define _gsDPLoadTextureTileYuv(timg, tmem, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, cms, cmt, \ - masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, G_TX_RENDERTILE, \ - (((lrs) - (uls) + 1) + 7) / 8) - -#define gsDPLoadMultiTile(timg, tmem, rt, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, rt, \ - (((lrs) - (uls) + 1) * G_SIZ_LDBITS(siz) + 63) / 64) - -#define gsDPLoadMultiTile_4b(timg, tmem, rt, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT4_( \ - timg, fmt, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, rt) - -#define gsDPLoadMultiTileYuv(timg, tmem, rt, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt) \ - gLTT_( \ - timg, fmt, siz, width, height, \ - uls, ult, lrs, lrt, pal, \ - cms, cmt, masks, maskt, shifts, shiftt, \ - tmem, rt, \ - (((lrs) - (uls) + 1) + 7) / 8) - -#define gsDPLoadBlock(tile, uls, ult, lrs, dxt) \ - gO_( \ - G_LOADBLOCK, \ - gF_(uls, 12, 12) | \ - gF_(ult, 12, 0), \ - gF_(tile, 3, 24) | \ - gF_(G_LDBLK_TXL(lrs), 12, 12) | \ - gF_(dxt, 12, 0)) - -#define gsDPNoOp() \ - gsDPNoOpTag(0) - -#define gsDPNoOpTag(tag) \ - gO_(G_NOOP, 0, tag) - -#define gsDPPipelineMode(mode) \ - gsSPSetOtherModeHi(G_MDSFT_PIPELINE, G_MDSIZ_PIPELINE, mode) - -#define gsDPSetBlendColor(r, g, b, a) \ - gO_( \ - G_SETBLENDCOLOR, \ - 0, \ - gF_(r, 8, 24) | \ - gF_(g, 8, 16) | \ - gF_(b, 8, 8) | \ - gF_(a, 8, 0)) - -#define gsDPSetEnvColor(r, g, b, a) \ - gO_( \ - G_SETENVCOLOR, \ - 0, \ - gF_(r, 8, 24) | \ - gF_(g, 8, 16) | \ - gF_(b, 8, 8) | \ - gF_(a, 8, 0)) - -#define gsDPSetFillColor(c) \ - gO_(G_SETFILLCOLOR, 0, c) - -#define gsDPSetFogColor(r, g, b, a) \ - gO_( \ - G_SETFOGCOLOR, 0, \ - gF_(r, 8, 24) | \ - gF_(g, 8, 16) | \ - gF_(b, 8, 8) | \ - gF_(a, 8, 0)) - -#define gsDPSetPrimColor(m, l, r, g, b, a) \ - gO_( \ - G_SETPRIMCOLOR, \ - gF_(m, 8, 8) | \ - gF_(l, 8, 0), \ - gF_(r, 8, 24) | \ - gF_(g, 8, 16) | \ - gF_(b, 8, 8) | \ - gF_(a, 8, 0)) - -#define gsDPSetColorImage(fmt, siz, width, img) \ - gO_( \ - G_SETCIMG, \ - gF_(fmt, 3, 21) | \ - gF_(siz, 2, 19) | \ - gF_((width) - 1, 12, 0), \ - img) - -#define gsDPSetDepthImage(img) \ - gO_(G_SETZIMG, 0, img) - -#define gsDPSetTextureImage(fmt, siz, width, img) \ - gO_( \ - G_SETTIMG, \ - gF_(fmt, 3, 21) | \ - gF_(siz, 2, 19) | \ - gF_((width) - 1, 12, 0), \ - img) - -#define gsDPSetHilite1Tile(tile, hilite, width, height) \ - gsDPSetTileSize( \ - tile, \ - ((Hilite *)(hilite))->h.x1 & 0xFFF, \ - ((Hilite *)(hilite))->h.y1 & 0xFFF, \ - (((width) - 1) * 4 + ((Hilite *)(hilite))->h.x1) & 0xFFF, \ - (((height) - 1) * 4 + ((Hilite *)(hilite))->h.y1) & 0xFFF) - -#define gsDPSetHilite2Tile(tile, hilite, width, height) \ - gsDPSetTileSize( \ - tile, \ - ((Hilite *)(hilite))->h.x2 & 0xFFF, \ - ((Hilite *)(hilite))->h.y2 & 0xFFF, \ - (((width) - 1) * 4 + ((Hilite *)(hilite))->h.x2) & 0xFFF, \ - (((height) - 1) * 4 + ((Hilite *)(hilite))->h.y2) & 0xFFF) - -#define gsDPSetAlphaCompare(mode) \ - gsSPSetOtherModeLo(G_MDSFT_ALPHACOMPARE, G_MDSIZ_ALPHACOMPARE, mode) - -#define gsDPSetAlphaDither(type) \ - gsSPSetOtherModeHi(G_MDSFT_ALPHADITHER, G_MDSIZ_ALPHADITHER, type) - -#define gsDPSetColorDither(type) \ - gsSPSetOtherModeHi(G_MDSFT_RGBDITHER, G_MDSIZ_RGBDITHER, type) - -#define gsDPSetCombineMode(mode1, mode2) \ - gsDPSetCombineLERP(mode1, mode2) - -#define gsDPSetCombineLERP(a0, b0, c0, d0, Aa0, Ab0, Ac0, Ad0, \ - a1, b1, c1, d1, Aa1, Ab1, Ac1, Ad1) \ - gO_( \ - G_SETCOMBINE, \ - gF_(G_CCMUX_##a0, 4, 20) | \ - gF_(G_CCMUX_##c0, 5, 15) | \ - gF_(G_ACMUX_##Aa0, 3, 12) | \ - gF_(G_ACMUX_##Ac0, 3, 9) | \ - gF_(G_CCMUX_##a1, 4, 5) | \ - gF_(G_CCMUX_##c1, 5, 0), \ - gF_(G_CCMUX_##b0, 4, 28) | \ - gF_(G_CCMUX_##b1, 4, 24) | \ - gF_(G_ACMUX_##Aa1, 3, 21) | \ - gF_(G_ACMUX_##Ac1, 3, 18) | \ - gF_(G_CCMUX_##d0, 3, 15) | \ - gF_(G_ACMUX_##Ab0, 3, 12) | \ - gF_(G_ACMUX_##Ad0, 3, 9) | \ - gF_(G_CCMUX_##d1, 3, 6) | \ - gF_(G_ACMUX_##Ab1, 3, 3) | \ - gF_(G_ACMUX_##Ad1, 3, 0)) - -#define gsDPSetConvert(k0, k1, k2, k3, k4, k5) \ - gO_( \ - G_SETCONVERT, \ - gF_(k0, 9, 13) | \ - gF_(k1, 9, 4) | \ - gF_(gI_(k2) >> 5, 4, 0), \ - gF_(k2, 5, 27) | \ - gF_(k3, 9, 18) | \ - gF_(k4, 9, 9) | \ - gF_(k5, 9, 0)) - -#define gsDPSetTextureConvert(type) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTCONV, G_MDSIZ_TEXTCONV, type) - -#define gsDPSetCycleType(type) \ - gsSPSetOtherModeHi(G_MDSFT_CYCLETYPE, G_MDSIZ_CYCLETYPE, type) - -#define gsDPSetDepthSource(source) \ - gsSPSetOtherModeLo(G_MDSFT_ZSRCSEL, G_MDSIZ_ZSRCSEL, source) - -#define gsDPSetCombineKey(type) \ - gsSPSetOtherModeHi(G_MDSFT_COMBKEY, G_MDSIZ_COMBKEY, type) - -#define gsDPSetKeyGB(cG, sG, wG, cB, sB, wB) \ - gO_( \ - G_SETKEYGB, \ - gF_(wG, 12, 12) | \ - gF_(wB, 12, 0), \ - gF_(cG, 8, 24) | \ - gF_(sG, 8, 16) | \ - gF_(cB, 8, 8) | \ - gF_(sB, 8, 0)) - -#define gsDPSetKeyR(cR, sR, wR) \ - gO_( \ - G_SETKEYR, 0, \ - gF_(wR, 12, 16) | \ - gF_(cR, 8, 8) | \ - gF_(sR, 8, 0)) - -#define gsDPSetPrimDepth(z, dz) \ - gO_( \ - G_SETPRIMDEPTH, \ - 0, \ - gF_(z, 16, 16) | \ - gF_(dz, 16, 0)) - -#define gsDPSetRenderMode(mode1, mode2) \ - gsSPSetOtherModeLo( \ - G_MDSFT_RENDERMODE, \ - G_MDSIZ_RENDERMODE, \ - gI_(mode1) | \ - gI_(mode2)) - -#define gsDPSetScissor(mode, ulx, uly, lrx, lry) \ - gsDPSetScissorFrac( \ - mode, \ - qu102(gI_(ulx)), \ - qu102(gI_(uly)), \ - qu102(gI_(lrx)), \ - qu102(gI_(lry))) - -#define gsDPSetScissorFrac(mode, ulx, uly, lrx, lry) \ - gO_( \ - G_SETSCISSOR, \ - gF_(ulx, 12, 12) | \ - gF_(uly, 12, 0), \ - gF_(mode, 2, 24) | \ - gF_(lrx, 12, 12) | \ - gF_(lry, 12, 0)) - -#define gsDPSetTextureDetail(type) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTDETAIL, G_MDSIZ_TEXTDETAIL, type) - -#define gsDPSetTextureFilter(mode) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTFILT, G_MDSIZ_TEXTFILT, mode) - -#define gsDPSetTextureLOD(mode) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTLOD, G_MDSIZ_TEXTLOD, mode) - -#define gsDPSetTextureLUT(mode) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTLUT, G_MDSIZ_TEXTLUT, mode) - -#define gsDPSetTexturePersp(enable) \ - gsSPSetOtherModeHi(G_MDSFT_TEXTPERSP, G_MDSIZ_TEXTPERSP, enable) - -#define gsDPSetTile(fmt, siz, line, tmem, tile, palette, \ - cmt, maskt, shiftt, cms, masks, shifts) \ - gO_( \ - G_SETTILE, \ - gF_(fmt, 3, 21) | \ - gF_(siz, 2, 19) | \ - gF_(line, 9, 9) | \ - gF_(tmem, 9, 0), \ - gF_(tile, 3, 24) | \ - gF_(palette, 4, 20) | \ - gF_(cmt, 2, 18) | \ - gF_(maskt, 4, 14) | \ - gF_(shiftt, 4, 10) | \ - gF_(cms, 2, 8) | \ - gF_(masks, 4, 4) | \ - gF_(shifts, 4, 0)) - -#define gsDPSetTileSize(tile, uls, ult, lrs, lrt) \ - gO_( \ - G_SETTILESIZE, \ - gF_(uls, 12, 12) | \ - gF_(ult, 12, 0), \ - gF_(tile, 3, 24) | \ - gF_(lrs, 12, 12) | \ - gF_(lrt, 12, 0)) - -#define gsSPBranchList(dl) \ - gsDisplayList(dl, 1) - -#define gsSPClipRatio(r) \ - gsMoveWd(G_MW_CLIP, G_MWO_CLIP_RNX, (uint16_t)(r)), \ - gsMoveWd(G_MW_CLIP, G_MWO_CLIP_RNY, (uint16_t)(r)), \ - gsMoveWd(G_MW_CLIP, G_MWO_CLIP_RPX, (uint16_t)-(r)), \ - gsMoveWd(G_MW_CLIP, G_MWO_CLIP_RPY, (uint16_t)-(r)) - -#define gsSPDisplayList(dl) \ - gsDisplayList(dl, 0) - -#define gsSPEndDisplayList() \ - gO_(G_ENDDL, 0, 0) - -#define gsSPFogFactor(fm, fo) \ - gsMoveWd( \ - G_MW_FOG, \ - G_MWO_FOG, \ - gF_(fm, 16, 16) | \ - gF_(fo, 16, 0)) - -#define gsSPFogPosition(min, max) \ - gsSPFogFactor( \ - (500 * 0x100) / ((max) - (min)), \ - (500 - (min)) * 0x100 / ((max) - (min))) - -#define gsSPLine3D(v0, v1, flag) \ - gsSPLineW3D(v0, v1, 0, flag) - -#define gsSPLookAt(l) \ - gsSPLookAtX(l), \ - gsSPLookAtY(gI_(l) + 0x10) - -#define gsSPSegment(seg, base) \ - gsMoveWd(G_MW_SEGMENT, (seg) * 4, base) - -#define gsSPSetLights0(lites) \ - gsSPNumLights(NUMLIGHTS_0), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).a, 2) - -#define gsSPSetLights1(lites) \ - gsSPNumLights(NUMLIGHTS_1), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).a, 2) - -#define gsSPSetLights2(lites) \ - gsSPNumLights(NUMLIGHTS_2), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).a, 3) - -#define gsSPSetLights3(lites) \ - gsSPNumLights(NUMLIGHTS_3), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).l[2], 3), \ - gsSPLight(&(lites).a, 4) - -#define gsSPSetLights4(lites) \ - gsSPNumLights(NUMLIGHTS_4), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).l[2], 3), \ - gsSPLight(&(lites).l[3], 4), \ - gsSPLight(&(lites).a, 5) - -#define gsSPSetLights5(lites) \ - gsSPNumLights(NUMLIGHTS_5), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).l[2], 3), \ - gsSPLight(&(lites).l[3], 4), \ - gsSPLight(&(lites).l[4], 5), \ - gsSPLight(&(lites).a, 6) - -#define gsSPSetLights6(lites) \ - gsSPNumLights(NUMLIGHTS_6), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).l[2], 3), \ - gsSPLight(&(lites).l[3], 4), \ - gsSPLight(&(lites).l[4], 5), \ - gsSPLight(&(lites).l[5], 6), \ - gsSPLight(&(lites).a, 7) - -#define gsSPSetLights7(lites) \ - gsSPNumLights(NUMLIGHTS_7), \ - gsSPLight(&(lites).l[0], 1), \ - gsSPLight(&(lites).l[1], 2), \ - gsSPLight(&(lites).l[2], 3), \ - gsSPLight(&(lites).l[3], 4), \ - gsSPLight(&(lites).l[4], 5), \ - gsSPLight(&(lites).l[5], 6), \ - gsSPLight(&(lites).l[6], 7), \ - gsSPLight(&(lites).a, 8) - -#define gsSPSetStatus(sid, val) \ - gsMoveWd(G_MW_GENSTAT, sid, val) - -#define gsSPNumLights(n) \ - gsMoveWd(G_MW_NUMLIGHT, G_MWO_NUMLIGHT, NUML(n)) - -#define gsSPLightColor(Lightnum, packedcolor) \ - gsMoveWd(G_MW_LIGHTCOL, G_MWO_a##Lightnum, packedcolor), \ - gsMoveWd(G_MW_LIGHTCOL, G_MWO_b##Lightnum, packedcolor) - -#define gsSPTextureRectangle(ulx, uly, lrx, lry, tile, s, t, dsdx, dtdy) \ - gsTexRect(ulx, uly, lrx, lry, tile), \ - gsDPHalf1(gF_(s, 16, 16) | gF_(t, 16, 0)), \ - gsDPHalf2(gF_(dsdx, 16, 16) | gF_(dtdy, 16, 0)) - -#define gsSPScisTextureRectangle(ulx, uly, lrx, lry, tile, s, t, dsdx, dtdy) \ - gsTexRect(gScC_(ulx), gScC_(uly), gScC_(lrx), gScC_(lry), tile), \ - gsDPHalf1( \ - gF_(gScD_(s, ulx, dsdx), 16, 16) | \ - gF_(gScD_(t, uly, dtdy), 16, 0)), \ - gsDPHalf2(gF_(dsdx, 16, 16) | gF_(dtdy, 16, 0)) - -#define gsSPTextureRectangleFlip(ulx, uly, lrx, lry, tile, s, t, dsdx, dtdy) \ - gsTexRectFlip(ulx, uly, lrx, lry, tile), \ - gsDPHalf1(gF_(s, 16, 16) | gF_(t, 16, 0)), \ - gsDPHalf2(gF_(dsdx, 16, 16) | gF_(dtdy, 16, 0)) - -#define gsSPScisTextureRectangleFlip( \ - ulx, uly, lrx, lry, tile, s, t, dsdx, dtdy) \ - gsTexRectFlip(gScC_(ulx), gScC_(uly), gScC_(lrx), gScC_(lry), tile), \ - gsDPHalf1( \ - gF_(gScD_(s, ulx, dsdx), 16, 16) | \ - gF_(gScD_(t, uly, dtdy), 16, 0)), \ - gsDPHalf2(gF_(dsdx, 16, 16) | gF_(dtdy, 16, 0)) - -#define gsSPBgRectCopy(bg) \ - gO_(G_BG_COPY, 0, bg) - -#define gsSPBgRect1Cyc(bg) \ - gO_(G_BG_1CYC, 0, bg) - -#define gsSPObjRectangle(sp) \ - gO_(G_OBJ_RECTANGLE, 0, sp) - -#define gsSPObjRectangleR(sp) \ - gO_(G_OBJ_RECTANGLE_R, 0, sp) - -#define gsSPObjSprite(sp) \ - gO_(G_OBJ_SPRITE, 0, sp) - -#define gsSPObjMatrix(mtx) \ - gO_( \ - G_OBJ_MOVEMEM, \ - gF_(sizeof(uObjMtx) - 1, 8, 16), \ - mtx) - -#define gsSPObjSubMatrix(mtx) \ - gO_( \ - G_OBJ_MOVEMEM, \ - gF_(sizeof(uObjSubMtx) - 1, 8, 16) | \ - gF_(2, 16, 0), \ - mtx) - -#define gsSPObjRenderMode(mode) \ - gO_(G_OBJ_RENDERMODE, 0, mode) - -#define gsSPObjLoadTxtr(tx) \ - gO_(G_OBJ_LOADTXTR, 23, tx) - -#define gsSPObjLoadTxRect(txsp) \ - gO_(G_OBJ_LDTX_RECT, 47, txsp) - -#define gsSPObjLoadTxRectR(txsp) \ - gO_(G_OBJ_LDTX_RECT_R, 47, txsp) - -#define gsSPObjLoadTxSprite(txsp) \ - gO_(G_OBJ_LDTX_SPRITE, 47, txsp) - -#define gsSPSelectDL(ldl, sid, flag, mask) \ - gO_( \ - G_RDPHALF_0, \ - gF_(sid, 8, 16) | \ - gF_(ldl, 16, 0), \ - flag), \ - gO_( \ - G_SELECT_DL, \ - gF_(0x00, 8, 16) | \ - gF_(gI_(ldl) >> 16, 16, 0), \ - mask) - -#define gsSPSelectBranchDL(bdl, sid, flag, mask) \ - gO_( \ - G_RDPHALF_0, \ - gF_(sid, 8, 16) | \ - gF_(bdl, 16, 0), \ - flag), \ - gO_( \ - G_SELECT_DL, \ - gF_(0x01, 8, 16) | \ - gF_(gI_(bdl) >> 16, 16, 0), \ - mask) - -/* unlisted instructions */ - -#define gsDPLoadTLUTCmd(tile, count) \ - gO_( \ - G_LOADTLUT, \ - 0, \ - gF_(tile, 3, 24) | \ - gF_(count, 10, 14)) - -#define gsDPLoadTLUT(count, tmem, dram) \ - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, dram), \ - gsDPTileSync(), \ - gsDPSetTile(0, 0, 0, tmem, G_TX_LOADTILE, 0, 0, 0, 0, 0, 0, 0), \ - gsDPLoadSync(), \ - gsDPLoadTLUTCmd(G_TX_LOADTILE, (count) - 1), \ - gsDPPipeSync() - -#define gsDisplayList(dl, branch) \ - gO_(G_DL, gF_(branch, 8, 16), dl) - -#define gsDPLoadTile(tile, uls, ult, lrs, lrt) \ - gO_( \ - G_LOADTILE, \ - gF_(uls, 12, 12) | \ - gF_(ult, 12, 0), \ - gF_(tile, 3, 24) | \ - gF_(lrs, 12, 12) | \ - gF_(lrt, 12, 0)) - -#define gsDPSetCombine(c) \ - gO_( \ - G_SETCOMBINE, \ - (gL_(c) >> 32) & 0xFFFFFFFF, \ - (gL_(c) >> 0) & 0xFFFFFFFF) - -#define gsSPSetOtherModeLo(shift, length, data) \ - gsSPSetOtherMode(G_SETOTHERMODE_L, shift, length, data) - -#define gsSPSetOtherModeHi(shift, length, data) \ - gsSPSetOtherMode(G_SETOTHERMODE_H, shift, length, data) - -#define gsDPSetOtherMode(mode0, mode1) \ - gO_(G_RDPSETOTHERMODE, gF_(mode0, 24, 0), mode1) - -#define gsTexRect(ulx, uly, lrx, lry, tile) \ - gO_( \ - G_TEXRECT, \ - gF_(lrx, 12, 12) | \ - gF_(lry, 12, 0), \ - gF_(tile, 3, 24) | \ - gF_(ulx, 12, 12) | \ - gF_(uly, 12, 0)) - -#define gsTexRectFlip(ulx, uly, lrx, lry, tile) \ - gO_( \ - G_TEXRECTFLIP, \ - gF_(lrx, 12, 12) | \ - gF_(lry, 12, 0), \ - gF_(tile, 3, 24) | \ - gF_(ulx, 12, 12) | \ - gF_(uly, 12, 0)) - -#define gsSPNoOp() \ - gO_(G_SPNOOP, 0, 0) - -#define gsDPHalf1(wordhi) \ - gO_(G_RDPHALF_1, 0, wordhi) - -#define gsDPHalf2(wordlo) \ - gO_(G_RDPHALF_2, 0, wordlo) - -#define gsDPWord(wordhi, wordlo) \ - gsDPHalf1(wordhi), \ - gsDPHalf2(wordlo) - -/* instruction macros for fast3d */ - -#if defined(F3D_GBI) - -# define gsSP1Triangle(v0, v1, v2, flag) \ - gO_( \ - G_TRI1, \ - 0, \ - gF_(flag, 8, 24) | \ - gF_(gI_(v0) * 10, 8, 16) | \ - gF_(gI_(v1) * 10, 8, 8) | \ - gF_(gI_(v2) * 10, 8, 0)) - -# define gsSPCullDisplayList(v0, vn) \ - gO_( \ - G_CULLDL, \ - (gI_(v0) & 0xF) * 40, \ - gI_((vn) + 1) & 0xF) * 40) - -# define gsSPLineW3D(v0, v1, wd, flag) \ - gO_( \ - G_LINE3D, \ - 0, \ - gF_(flag, 8, 24) | \ - gF_(gI_(v0) * 10, 8, 16) | \ - gF_(gI_(v1) * 10, 8, 8) | \ - gF_(wd, 8, 0)) - -# define gsSPVertex(v, n, v0) \ - gO_( \ - G_VTX, \ - gF_((n) - 1, 4, 20) | \ - gF_(v0, 4, 16) | \ - gF_(sizeof(Vtx) * (n), 16, 0), \ - v) - -#endif - -/* instruction macros for fast3d and beta f3dex */ -#if defined(F3D_GBI) || (defined(F3D_BETA) && defined(F3DEX_GBI)) - -# define gsSPModifyVertex(vtx, where, val) \ - gsMoveWd(G_MW_POINTS, (vtx) * 40 + (where), val) - -#endif - -/* instruction macros for fast3d and f3dex */ - -#if defined(F3D_GBI) || defined(F3DEX_GBI) - -# define gsSPForceMatrix(mptr) \ - gsMoveMem(16, G_MV_MATRIX_1, (char *)(mptr)), \ - gsMoveMem(16, G_MV_MATRIX_2, (char *)(mptr) + 16), \ - gsMoveMem(16, G_MV_MATRIX_3, (char *)(mptr) + 32), \ - gsMoveMem(16, G_MV_MATRIX_4, (char *)(mptr) + 48) - -# define gsSPSetGeometryMode(mode) \ - gO_(G_SETGEOMETRYMODE, 0, gI_(mode)) - -# define gsSPClearGeometryMode(mode) \ - gO_(G_CLEARGEOMETRYMODE, 0, gI_(mode)) - -# define gsSPLoadGeometryMode(mode) \ - gsSPClearGeometryMode(~gI_(0)), \ - gsSPSetGeometryMode(mode) - -# define gsSPInsertMatrix(where, num) \ - gsMoveWd(G_MW_MATRIX, where, num) - -# define gsSPLookAtX(l) \ - gsMoveMem(sizeof(Light), G_MV_LOOKATX, l) - -# define gsSPLookAtY(l) \ - gsMoveMem(sizeof(Light), G_MV_LOOKATY, l) - -# define gsSPMatrix(matrix, param) \ - gO_( \ - G_MTX, \ - gF_(param, 8, 16) | \ - gF_(sizeof(Mtx), 16, 0), \ - matrix) - -# define gsSPPopMatrix(param) \ - gO_(G_POPMTX, 0, param) - -# define gsSPLight(l, n) \ - gsMoveMem(sizeof(Light), G_MV_L0 + ((n) - 1) * 2, l) - -# define gsSPTexture(sc, tc, level, tile, on) \ - gO_( \ - G_TEXTURE, \ - gF_(level, 3, 11) | \ - gF_(tile, 3, 8) | \ - gF_(on, 8, 0), \ - gF_(sc, 16, 16) | \ - gF_(tc, 16, 0)) - -# define gsSPViewport(v) \ - gsMoveMem(sizeof(Vp), G_MV_VIEWPORT, v) - -# define gsSPSetOtherMode(opc, shift, length, data) \ - gO_( \ - opc, \ - gF_(shift, 8, 8) | \ - gF_(length, 8, 0), \ - data) - -# define gsMoveWd(index, offset, data) \ - gO_( \ - G_MOVEWORD, \ - gF_(offset, 16, 8) | \ - gF_(index, 8, 0), \ - data) - -# define gsMoveMem(size, index, address) \ - gO_( \ - G_MOVEMEM, \ - gF_(index, 8, 16) | \ - gF_(size, 16, 0), \ - address) - -#endif - -/* instruction macros for f3dex */ - -#if defined(F3DEX_GBI) - -# define gsSP1Triangle(v0, v1, v2, flag) \ - gO_( \ - G_TRI1, \ - 0, \ - gF_(gV3_(v0, v1, v2, flag) * 2, 8, 16) | \ - gF_(gV3_(v1, v2, v0, flag) * 2, 8, 8) | \ - gF_(gV3_(v2, v0, v1, flag) * 2, 8, 0)) - -# define gsSP1Quadrangle(v0, v1, v2, v3, flag) \ - gO_( \ - G_TRI2, \ - gF_(gV4_(v0, v1, v2, v3, flag) * 2, 8, 16) | \ - gF_(gV4_(v1, v2, v3, v0, flag) * 2, 8, 8) | \ - gF_(gV4_(v2, v3, v0, v1, flag) * 2, 8, 0), \ - gF_(gV4_(v0, v1, v2, v3, flag) * 2, 8, 16) | \ - gF_(gV4_(v2, v3, v0, v1, flag) * 2, 8, 8) | \ - gF_(gV4_(v3, v0, v1, v2, flag) * 2, 8, 0)) - -# define gsSPLineW3D(v0, v1, wd, flag) \ - gO_( \ - G_LINE3D, \ - 0, \ - gF_(gV2_(v0, v1, flag) * 2, 8, 16) | \ - gF_(gV2_(v1, v0, flag) * 2, 8, 8) | \ - gF_(wd, 8, 0)) - -# define gsSPVertex(v, n, v0) \ - gO_( \ - G_VTX, \ - gF_((v0) * 2, 8, 16) | \ - gF_(n, 6, 10) | \ - gF_(sizeof(Vtx) * (n) - 1, 10, 0), \ - v) - -#endif - -/* instruction macros for f3dex and f3dex2 */ - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - -# define gsSP2Triangles(v00, v01, v02, flag0, v10, v11, v12, flag1) \ - gO_( \ - G_TRI2, \ - gF_(gV3_(v00, v01, v02, flag0) * 2, 8, 16) | \ - gF_(gV3_(v01, v02, v00, flag0) * 2, 8, 8) | \ - gF_(gV3_(v02, v00, v01, flag0) * 2, 8, 0), \ - gF_(gV3_(v10, v11, v12, flag1) * 2, 8, 16) | \ - gF_(gV3_(v11, v12, v10, flag1) * 2, 8, 8) | \ - gF_(gV3_(v12, v10, v11, flag1) * 2, 8, 0)) - -# define gsSPBranchLessZ(branchdl, vtx, zval, near, far, flag) \ - gsSPBranchLessZrg(branchdl, vtx, zval, near, far, flag, 0, G_MAXZ) - -# define gsSPBranchLessZrg(branchdl, vtx, zval, near, far, flag, zmin, zmax) \ - gsSPBranchLessZraw(branchdl, vtx, \ - G_DEPTOZSrg(zval, near, far, flag, zmin, zmax)) - -# define gsSPBranchLessZraw(branchdl, vtx, zval) \ - gsDPHalf1(branchdl), \ - gsBranchZ(vtx, zval) - -# define gsSPCullDisplayList(v0, vn) \ - gO_( \ - G_CULLDL, \ - gF_((v0) * 2, 16, 0), \ - gF_((vn) * 2, 16, 0)) - -# define gsSPLoadUcode(uc_start, uc_dstart) \ - gsSPLoadUcodeEx(uc_start, uc_dstart, 0x800) - -# define gsSPLoadUcodeL(ucode) \ - gsSPLoadUcode( \ - gI_(&ucode##TextStart) & 0x1FFFFFFF, \ - gI_(&ucode##DataStart) & 0x1FFFFFFF) - -# if !(defined(F3D_BETA) && defined(F3DEX_GBI)) -# define gsSPModifyVertex(vtx, where, val) \ - gO_( \ - G_MODIFYVTX, \ - gF_(where, 8, 16) | \ - gF_((vtx) * 2, 16, 0), \ - val) -# endif - -# define gsBranchZ(vtx, zval) \ - gO_( \ - G_BRANCH_Z, \ - gF_((vtx) * 5, 12, 12) | \ - gF_((vtx) * 2, 12, 0), \ - zval) - -# define gsLoadUcode(uc_start, uc_dsize) \ - gO_( \ - G_LOAD_UCODE, \ - gF_((uc_dsize) - 1, 16, 0), \ - uc_start) - -# define gsSPLoadUcodeEx(uc_start, uc_dstart, uc_dsize) \ - gsDPHalf1(uc_dstart), \ - gsLoadUcode(uc_start, uc_dsize) - -#endif - -/* instruction macros for f3dex2 */ - -#if defined(F3DEX_GBI_2) - -# define gsSP1Triangle(v0, v1, v2, flag) \ - gO_( \ - G_TRI1, \ - gF_(gV3_(v0, v1, v2, flag) * 2, 8, 16) | \ - gF_(gV3_(v1, v2, v0, flag) * 2, 8, 8) | \ - gF_(gV3_(v2, v0, v1, flag) * 2, 8, 0), \ - 0) - -# define gsSP1Quadrangle(v0, v1, v2, v3, flag) \ - gO_( \ - G_QUAD, \ - gF_(gV4_(v0, v1, v2, v3, flag) * 2, 8, 16) | \ - gF_(gV4_(v1, v2, v3, v0, flag) * 2, 8, 8) | \ - gF_(gV4_(v2, v3, v0, v1, flag) * 2, 8, 0), \ - gF_(gV4_(v0, v1, v2, v3, flag) * 2, 8, 16) | \ - gF_(gV4_(v2, v3, v0, v1, flag) * 2, 8, 8) | \ - gF_(gV4_(v3, v0, v1, v2, flag) * 2, 8, 0)) - -# define gsSPForceMatrix(mptr) \ - gsMoveMem(sizeof(Mtx), G_MV_MATRIX, 0, mptr), \ - gsMoveWd(G_MW_FORCEMTX, 0, 0x10000) - -# define gsSPSetGeometryMode(mode) \ - gsSPGeometryMode(0, mode) - -# define gsSPClearGeometryMode(mode) \ - gsSPGeometryMode(mode, 0) - -# define gsSPLoadGeometryMode(mode) \ - gsSPGeometryMode(~gI_(0), mode) - -# define gsSPLineW3D(v0, v1, wd, flag) \ - gO_( \ - G_LINE3D, \ - gF_(gV2_(v0, v1, flag) * 2, 8, 16) | \ - gF_(gV2_(v1, v0, flag) * 2, 8, 8) | \ - gF_(wd, 8, 0), \ - 0) - -# define gsSPLookAtX(l) \ - gsMoveMem(sizeof(Light), G_MV_LIGHT, G_MVO_LOOKATX, l) - -# define gsSPLookAtY(l) \ - gsMoveMem(sizeof(Light), G_MV_LIGHT, G_MVO_LOOKATY, l) - -# define gsSPMatrix(matrix, param) \ - gO_( \ - G_MTX, \ - gF_((sizeof(Mtx) - 1) / 8, 5, 19) | \ - gF_(gI_(param) ^ G_MTX_PUSH, 8, 0), \ - matrix) - -# define gsSPPopMatrix(param) \ - gsSPPopMatrixN(param, 1) - -# define gsSPPopMatrixN(param, n) \ - gO_( \ - G_POPMTX, \ - gF_((sizeof(Mtx) - 1) / 8, 5, 19) | \ - gF_(2, 8, 0), \ - sizeof(Mtx) * (n)) - -# define gsSPLight(l, n) \ - gsMoveMem(sizeof(Light), G_MV_LIGHT, ((n) + 1) * 0x18, l) - -# define gsSPTexture(sc, tc, level, tile, on) \ - gO_( \ - G_TEXTURE, \ - gF_(level, 3, 11) | \ - gF_(tile, 3, 8) | \ - gF_(on, 7, 1), \ - gF_(sc, 16, 16) | \ - gF_(tc, 16, 0)) - -# define gsSPVertex(v, n, v0) \ - gO_( \ - G_VTX, \ - gF_(n, 8, 12) | \ - gF_((v0) + (n), 7, 1), \ - v) - -# define gsSPViewport(v) \ - gsMoveMem(sizeof(Vp), G_MV_VIEWPORT, 0, v) - -# define gsSPGeometryMode(clearbits, setbits) \ - gO_( \ - G_GEOMETRYMODE, \ - gF_(~gI_(clearbits), 24, 0), \ - setbits) - -# define gsSPSetOtherMode(opc, shift, length, data) \ - gO_( \ - opc, \ - gF_(32 - (shift) - (length), 8, 8) | \ - gF_((length) - 1, 8, 0), \ - data) - -# define gsMoveWd(index, offset, data) \ - gO_( \ - G_MOVEWORD, \ - gF_(index, 8, 16) | \ - gF_(offset, 16, 0), \ - data) - -# define gsMoveMem(size, index, offset, address) \ - gO_( \ - G_MOVEMEM, \ - gF_((size - 1) / 8, 5, 19) | \ - gF_((offset) / 8, 8, 8) | \ - gF_(index, 8, 0), \ - address) - -# define gsSPDma_io(flag, dmem, dram, size) \ - gO_( \ - G_DMA_IO, \ - gF_(flag, 1, 23) | \ - gF_((dmem) / 8, 10, 13) | \ - gF_((size) - 1, 12, 0), \ - dram) - -# define gsSPDmaRead(dmem, dram, size) \ - gsSPDma_io(0, dmem, dram, size) - -# define gsSPDmaWrite(dmem, dram, size) \ - gsSPDma_io(1, dmem, dram, size) - -# define gsSpecial3(hi, lo) \ - gO_(G_SPECIAL_3, hi, lo) - -# define gsSpecial2(hi, lo) \ - gO_(G_SPECIAL_2, hi, lo) - -# define gsSpecial1(hi, lo) \ - gO_(G_SPECIAL_1, hi, lo) - -#endif - -/* instruction macros for beta fast3d and f3dex */ - -#if defined(F3D_BETA) && (defined(F3D_GBI) || defined(F3DEX_GBI)) - -# define gsSPPerspNormalize(scale) \ - gO_(G_PERSPNORM, 0, scale) - -#else - -# define gsSPPerspNormalize(scale) \ - gsMoveWd(G_MW_PERSPNORM, 0, scale) - -#endif - -/* dynamic instruction macros */ - -#define gDisplayListPut(gdl, ...) \ - ({ \ - Gfx Gd_[] = {__VA_ARGS__}; \ - for(size_t Gi_ = 0; Gi_ < sizeof(Gd_) / sizeof(Gfx); Gi_++) \ - { \ - *(Gfx *)(gdl) = Gd_[Gi_]; \ - } \ - (void)0; \ - }) -#define gDisplayListAppend(pgdl, ...) \ - ({ \ - Gfx Gd_[] = {__VA_ARGS__}; \ - for(size_t Gi_ = 0; Gi_ < sizeof(Gd_) / sizeof(Gfx); Gi_++) \ - { \ - *(*(Gfx **)(pgdl))++ = Gd_[Gi_]; \ - } \ - (void)0; \ - }) -#define gDisplayListData(pgdl, d) \ - ({ \ - Gfx **Gp_ = (void *)(pgdl); \ - struct \ - { \ - __typeof__(d) v; \ - } *Gd_, *Gs_; \ - *Gp_ -= (sizeof(*Gd_) + sizeof(Gfx) - 1) / sizeof(Gfx); \ - Gd_ = (void *)*Gp_; \ - Gs_ = (void *)&(d); \ - *Gd_ = *Gs_; \ - &Gd_->v; \ - }) -#define gDisplayListAlloc(pgdl, s) \ - ({ \ - Gfx **Gp_ = (void *)(pgdl); \ - *Gp_ -= ((s) + sizeof(Gfx) - 1) / sizeof(Gfx); \ - (void *)*Gp_; \ - }) - -#define gDPFillRectangle(gdl, ...) \ - gD_(gdl, gsDPFillRectangle, __VA_ARGS__) -#define gDPScisFillRectangle(gdl, ...) \ - gD_(gdl, gsDPScisFillRectangle, __VA_ARGS__) -#define gDPFullSync(gdl) \ - gDisplayListPut(gdl, gsDPFullSync()) -#define gDPLoadSync(gdl) \ - gDisplayListPut(gdl, gsDPLoadSync()) -#define gDPTileSync(gdl) \ - gDisplayListPut(gdl, gsDPTileSync()) -#define gDPPipeSync(gdl) \ - gDisplayListPut(gdl, gsDPPipeSync()) -#define gDPLoadTLUT_pal16(gdl, ...) \ - gD_(gdl, gsDPLoadTLUT_pal16, __VA_ARGS__) -#define gDPLoadTLUT_pal256(gdl, ...) \ - gD_(gdl, gsDPLoadTLUT_pal256, __VA_ARGS__) -#define gDPLoadTextureBlock(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlock, __VA_ARGS__) -#define gDPLoadTextureBlockS(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlockS, __VA_ARGS__) -#define gDPLoadTextureBlock_4b(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlock_4b, __VA_ARGS__) -#define gDPLoadTextureBlock_4bS(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlock_4bS, __VA_ARGS__) -#define gDPLoadTextureBlockYuv(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlockYuv, __VA_ARGS__) -#define gDPLoadTextureBlockYuvS(gdl, ...) \ - gD_(gdl, gsDPLoadTextureBlockYuvS, __VA_ARGS__) -#define _gDPLoadTextureBlock(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlock, __VA_ARGS__) -#define _gDPLoadTextureBlockS(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlockS, __VA_ARGS__) -#define _gDPLoadTextureBlock_4b(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlock_4b, __VA_ARGS__) -#define _gDPLoadTextureBlock_4bS(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlock_4bS, __VA_ARGS__) -#define _gDPLoadTextureBlockYuv(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlockYuv, __VA_ARGS__) -#define _gDPLoadTextureBlockYuvS(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureBlockYuvS, __VA_ARGS__) -#define gDPLoadMultiBlock(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlock, __VA_ARGS__) -#define gDPLoadMultiBlockS(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlockS, __VA_ARGS__) -#define gDPLoadMultiBlock_4b(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlock_4b, __VA_ARGS__) -#define gDPLoadMultiBlock_4bS(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlock_4bS, __VA_ARGS__) -#define gDPLoadMultiBlockYuv(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlockYuv, __VA_ARGS__) -#define gDPLoadMultiBlockYuvS(gdl, ...) \ - gD_(gdl, gsDPLoadMultiBlockYuvS, __VA_ARGS__) -#define gDPLoadTextureTile(gdl, ...) \ - gD_(gdl, gsDPLoadTextureTile, __VA_ARGS__) -#define gDPLoadTextureTile_4b(gdl, ...) \ - gD_(gdl, gsDPLoadTextureTile_4b, __VA_ARGS__) -#define gDPLoadTextureTileYuv(gdl, ...) \ - gD_(gdl, gsDPLoadTextureTileYuv, __VA_ARGS__) -#define _gDPLoadTextureTile(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureTile, __VA_ARGS__) -#define _gDPLoadTextureTile_4b(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureTile_4b, __VA_ARGS__) -#define _gDPLoadTextureTileYuv(gdl, ...) \ - gD_(gdl, _gsDPLoadTextureTileYuv, __VA_ARGS__) -#define gDPLoadMultiTile(gdl, ...) \ - gD_(gdl, gsDPLoadMultiTile, __VA_ARGS__) -#define gDPLoadMultiTile_4b(gdl, ...) \ - gD_(gdl, gsDPLoadMultiTile_4b, __VA_ARGS__) -#define gDPLoadMultiTileYuv(gdl, ...) \ - gD_(gdl, gsDPLoadMultiTileYuv, __VA_ARGS__) -#define gDPLoadBlock(gdl, ...) \ - gD_(gdl, gsDPLoadBlock, __VA_ARGS__) -#define gDPNoOp(gdl) \ - gDisplayListPut(gdl, gsDPNoOp()) -#define gDPNoOpTag(gdl, ...) \ - gD_(gdl, gsDPNoOpTag, __VA_ARGS__) -#define gDPPipelineMode(gdl, ...) \ - gD_(gdl, gsDPPipelineMode, __VA_ARGS__) -#define gDPSetBlendColor(gdl, ...) \ - gD_(gdl, gsDPSetBlendColor, __VA_ARGS__) -#define gDPSetEnvColor(gdl, ...) \ - gD_(gdl, gsDPSetEnvColor, __VA_ARGS__) -#define gDPSetFillColor(gdl, ...) \ - gD_(gdl, gsDPSetFillColor, __VA_ARGS__) -#define gDPSetFogColor(gdl, ...) \ - gD_(gdl, gsDPSetFogColor, __VA_ARGS__) -#define gDPSetPrimColor(gdl, ...) \ - gD_(gdl, gsDPSetPrimColor, __VA_ARGS__) -#define gDPSetColorImage(gdl, ...) \ - gD_(gdl, gsDPSetColorImage, __VA_ARGS__) -#define gDPSetDepthImage(gdl, ...) \ - gD_(gdl, gsDPSetDepthImage, __VA_ARGS__) -#define gDPSetTextureImage(gdl, ...) \ - gD_(gdl, gsDPSetTextureImage, __VA_ARGS__) -#define gDPSetHilite1Tile(gdl, ...) \ - gD_(gdl, gsDPSetHilite1Tile, __VA_ARGS__) -#define gDPSetHilite2Tile(gdl, ...) \ - gD_(gdl, gsDPSetHilite2Tile, __VA_ARGS__) -#define gDPSetAlphaCompare(gdl, ...) \ - gD_(gdl, gsDPSetAlphaCompare, __VA_ARGS__) -#define gDPSetAlphaDither(gdl, ...) \ - gD_(gdl, gsDPSetAlphaDither, __VA_ARGS__) -#define gDPSetColorDither(gdl, ...) \ - gD_(gdl, gsDPSetColorDither, __VA_ARGS__) -#define gDPSetCombineMode(gdl, ...) \ - gD_(gdl, gsDPSetCombineLERP, __VA_ARGS__) -#define gDPSetCombineLERP(gdl, ...) \ - gD_(gdl, gsDPSetCombineLERP, __VA_ARGS__) -#define gDPSetConvert(gdl, ...) \ - gD_(gdl, gsDPSetConvert, __VA_ARGS__) -#define gDPSetTextureConvert(gdl, ...) \ - gD_(gdl, gsDPSetTextureConvert, __VA_ARGS__) -#define gDPSetCycleType(gdl, ...) \ - gD_(gdl, gsDPSetCycleType, __VA_ARGS__) -#define gDPSetDepthSource(gdl, ...) \ - gD_(gdl, gsDPSetDepthSource, __VA_ARGS__) -#define gDPSetCombineKey(gdl, ...) \ - gD_(gdl, gsDPSetCombineKey, __VA_ARGS__) -#define gDPSetKeyGB(gdl, ...) \ - gD_(gdl, gsDPSetKeyGB, __VA_ARGS__) -#define gDPSetKeyR(gdl, ...) \ - gD_(gdl, gsDPSetKeyR, __VA_ARGS__) -#define gDPSetPrimDepth(gdl, ...) \ - gD_(gdl, gsDPSetPrimDepth, __VA_ARGS__) -#define gDPSetRenderMode(gdl, ...) \ - gD_(gdl, gsDPSetRenderMode, __VA_ARGS__) -#define gDPSetScissor(gdl, ...) \ - gD_(gdl, gsDPSetScissor, __VA_ARGS__) -#define gDPSetScissorFrac(gdl, ...) \ - gD_(gdl, gsDPSetScissorFrac, __VA_ARGS__) -#define gDPSetTextureDetail(gdl, ...) \ - gD_(gdl, gsDPSetTextureDetail, __VA_ARGS__) -#define gDPSetTextureFilter(gdl, ...) \ - gD_(gdl, gsDPSetTextureFilter, __VA_ARGS__) -#define gDPSetTextureLOD(gdl, ...) \ - gD_(gdl, gsDPSetTextureLOD, __VA_ARGS__) -#define gDPSetTextureLUT(gdl, ...) \ - gD_(gdl, gsDPSetTextureLUT, __VA_ARGS__) -#define gDPSetTexturePersp(gdl, ...) \ - gD_(gdl, gsDPSetTexturePersp, __VA_ARGS__) -#define gDPSetTile(gdl, ...) \ - gD_(gdl, gsDPSetTile, __VA_ARGS__) -#define gDPSetTileSize(gdl, ...) \ - gD_(gdl, gsDPSetTileSize, __VA_ARGS__) -#define gSP1Triangle(gdl, ...) \ - gD_(gdl, gsSP1Triangle, __VA_ARGS__) -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define gSP2Triangles(gdl, ...) \ - gD_(gdl, gsSP2Triangles, __VA_ARGS__) -# define gSP1Quadrangle(gdl, ...) \ - gD_(gdl, gsSP1Quadrangle, __VA_ARGS__) -# define gSPBranchLessZ(gdl, ...) \ - gD_(gdl, gsSPBranchLessZ, __VA_ARGS__) -# define gSPBranchLessZrg(gdl, ...) \ - gD_(gdl, gsSPBranchLessZrg, __VA_ARGS__) -# define gSPBranchLessZraw(gdl, ...) \ - gD_(gdl, gsSPBranchLessZraw, __VA_ARGS__) -#endif -#define gSPBranchList(gdl, ...) \ - gD_(gdl, gsSPBranchList, __VA_ARGS__) -#define gSPClipRatio(gdl, ...) \ - gD_(gdl, gsSPClipRatio, __VA_ARGS__) -#define gSPCullDisplayList(gdl, ...) \ - gD_(gdl, gsSPCullDisplayList, __VA_ARGS__) -#define gSPDisplayList(gdl, ...) \ - gD_(gdl, gsSPDisplayList, __VA_ARGS__) -#define gSPEndDisplayList(gdl) \ - gDisplayListPut(gdl, gsSPEndDisplayList()) -#define gSPFogFactor(gdl, ...) \ - gD_(gdl, gsSPFogFactor, __VA_ARGS__) -#define gSPFogPosition(gdl, ...) \ - gD_(gdl, gsSPFogPosition, __VA_ARGS__) -#define gSPForceMatrix(gdl, ...) \ - gD_(gdl, gsSPForceMatrix, __VA_ARGS__) -#define gSPSetGeometryMode(gdl, ...) \ - gD_(gdl, gsSPSetGeometryMode, __VA_ARGS__) -#define gSPClearGeometryMode(gdl, ...) \ - gD_(gdl, gsSPClearGeometryMode, __VA_ARGS__) -#define gSPLoadGeometryMode(gdl, ...) \ - gD_(gdl, gsSPLoadGeometryMode, __VA_ARGS__) -#if defined(F3D_GBI) || defined(F3DEX_GBI) -# define gSPInsertMatrix(gdl, ...) \ - gD_(gdl, gsSPInsertMatrix, __VA_ARGS__) -#endif -#define gSPLine3D(gdl, ...) \ - gD_(gdl, gsSPLine3D, __VA_ARGS__) -#define gSPLineW3D(gdl, ...) \ - gD_(gdl, gsSPLineW3D, __VA_ARGS__) -#define gSPLoadUcode(gdl, ...) \ - gD_(gdl, gsSPLoadUcode, __VA_ARGS__) -#define gSPLoadUcodeL(gdl, ...) \ - gD_(gdl, gsSPLoadUcodeL, __VA_ARGS__) -#define gSPLookAtX(gdl, ...) \ - gD_(gdl, gsSPLookAtX, __VA_ARGS__) -#define gSPLookAtY(gdl, ...) \ - gD_(gdl, gsSPLookAtY, __VA_ARGS__) -#define gSPLookAt(gdl, ...) \ - gD_(gdl, gsSPLookAt, __VA_ARGS__) -#define gSPMatrix(gdl, ...) \ - gD_(gdl, gsSPMatrix, __VA_ARGS__) -#define gSPModifyVertex(gdl, ...) \ - gD_(gdl, gsSPModifyVertex, __VA_ARGS__) -#define gSPPerspNormalize(gdl, ...) \ - gD_(gdl, gsSPPerspNormalize, __VA_ARGS__) -#define gSPPopMatrix(gdl, ...) \ - gD_(gdl, gsSPPopMatrix, __VA_ARGS__) -#if defined(F3DEX_GBI_2) -# define gSPPopMatrixN(gdl, ...) \ - gD_(gdl, gsSPPopMatrixN, __VA_ARGS__) -#endif -#define gSPSegment(gdl, ...) \ - gD_(gdl, gsSPSegment, __VA_ARGS__) -#define gSPSetLights0(gdl, ...) \ - gD_(gdl, gsSPSetLights0, __VA_ARGS__) -#define gSPSetLights1(gdl, ...) \ - gD_(gdl, gsSPSetLights1, __VA_ARGS__) -#define gSPSetLights2(gdl, ...) \ - gD_(gdl, gsSPSetLights2, __VA_ARGS__) -#define gSPSetLights3(gdl, ...) \ - gD_(gdl, gsSPSetLights3, __VA_ARGS__) -#define gSPSetLights4(gdl, ...) \ - gD_(gdl, gsSPSetLights4, __VA_ARGS__) -#define gSPSetLights5(gdl, ...) \ - gD_(gdl, gsSPSetLights5, __VA_ARGS__) -#define gSPSetLights6(gdl, ...) \ - gD_(gdl, gsSPSetLights6, __VA_ARGS__) -#define gSPSetLights7(gdl, ...) \ - gD_(gdl, gsSPSetLights7, __VA_ARGS__) -#define gSPSetStatus(gdl, ...) \ - gD_(gdl, gsSPSetStatus, __VA_ARGS__) -#define gSPNumLights(gdl, ...) \ - gD_(gdl, gsSPNumLights, __VA_ARGS__) -#define gSPLight(gdl, ...) \ - gD_(gdl, gsSPLight, __VA_ARGS__) -#define gSPLightColor(gdl, ...) \ - gD_(gdl, gsSPLightColor, __VA_ARGS__) -#define gSPTexture(gdl, ...) \ - gD_(gdl, gsSPTexture, __VA_ARGS__) -#define gSPTextureRectangle(gdl, ...) \ - gD_(gdl, gsSPTextureRectangle, __VA_ARGS__) -#define gSPScisTextureRectangle(gdl, ...) \ - gD_(gdl, gsSPScisTextureRectangle, __VA_ARGS__) -#define gSPTextureRectangleFlip(gdl, ...) \ - gD_(gdl, gsSPTextureRectangleFlip, __VA_ARGS__) -#define gSPScisTextureRectangleFlip(gdl, ...) \ - gD_(gdl, gsSPScisTextureRectangleFlip, __VA_ARGS__) -#define gSPVertex(gdl, ...) \ - gD_(gdl, gsSPVertex, __VA_ARGS__) -#define gSPViewport(gdl, ...) \ - gD_(gdl, gsSPViewport, __VA_ARGS__) -#define gSPBgRectCopy(gdl, ...) \ - gD_(gdl, gsSPBgRectCopy, __VA_ARGS__) -#define gSPBgRect1Cyc(gdl, ...) \ - gD_(gdl, gsSPBgRect1Cyc, __VA_ARGS__) -#define gSPObjRectangle(gdl, ...) \ - gD_(gdl, gsSPObjRectangle, __VA_ARGS__) -#define gSPObjRectangleR(gdl, ...) \ - gD_(gdl, gsSPObjRectangleR, __VA_ARGS__) -#define gSPObjSprite(gdl, ...) \ - gD_(gdl, gsSPObjSprite, __VA_ARGS__) -#define gSPObjMatrix(gdl, ...) \ - gD_(gdl, gsSPObjMatrix, __VA_ARGS__) -#define gSPObjSubMatrix(gdl, ...) \ - gD_(gdl, gsSPObjSubMatrix, __VA_ARGS__) -#define gSPObjRenderMode(gdl, ...) \ - gD_(gdl, gsSPObjRenderMode, __VA_ARGS__) -#define gSPObjLoadTxtr(gdl, ...) \ - gD_(gdl, gsSPObjLoadTxtr, __VA_ARGS__) -#define gSPObjLoadTxRect(gdl, ...) \ - gD_(gdl, gsSPObjLoadTxRect, __VA_ARGS__) -#define gSPObjLoadTxRectR(gdl, ...) \ - gD_(gdl, gsSPObjLoadTxRectR, __VA_ARGS__) -#define gSPObjLoadTxSprite(gdl, ...) \ - gD_(gdl, gsSPObjLoadTxSprite, __VA_ARGS__) -#define gSPSelectDL(gdl, ...) \ - gD_(gdl, gsSPSelectDL, __VA_ARGS__) -#define gSPSelectBranchDL(gdl, ...) \ - gD_(gdl, gsSPSelectBranchDL, __VA_ARGS__) -#define gDPLoadTLUTCmd(gdl, ...) \ - gD_(gdl, gsDPLoadTLUTCmd, __VA_ARGS__) -#define gDPLoadTLUT(gdl, ...) \ - gD_(gdl, gsDPLoadTLUT, __VA_ARGS__) -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define gBranchZ(gdl, ...) \ - gD_(gdl, gsBranchZ, __VA_ARGS__) -#endif -#define gDisplayList(gdl, ...) \ - gD_(gdl, gsDisplayList, __VA_ARGS__) -#define gDPHalf1(gdl, ...) \ - gD_(gdl, gsDPHalf1, __VA_ARGS__) -#define gDPHalf2(gdl, ...) \ - gD_(gdl, gsDPHalf2, __VA_ARGS__) -#define gDPLoadTile(gdl, ...) \ - gD_(gdl, gsDPLoadTile, __VA_ARGS__) -#define gDPSetCombine(gdl, ...) \ - gD_(gdl, gsDPSetCombine, __VA_ARGS__) -#if defined(F3DEX_GBI_2) -# define gSPGeometryMode(gdl, ...) \ - gD_(gdl, gsSPGeometryMode, __VA_ARGS__) -#endif -#define gSPSetOtherMode(gdl, ...) \ - gD_(gdl, gsSPSetOtherMode, __VA_ARGS__) -#define gSPSetOtherModeLo(gdl, ...) \ - gD_(gdl, gsSPSetOtherModeLo, __VA_ARGS__) -#define gSPSetOtherModeHi(gdl, ...) \ - gD_(gdl, gsSPSetOtherModeHi, __VA_ARGS__) -#define gDPSetOtherMode(gdl, ...) \ - gD_(gdl, gsDPSetOtherMode, __VA_ARGS__) -#define gMoveWd(gdl, ...) \ - gD_(gdl, gsMoveWd, __VA_ARGS__) -#define gMoveMem(gdl, ...) \ - gD_(gdl, gsMoveMem, __VA_ARGS__) -#if defined(F3DEX_GBI_2) -# define gSPDma_io(gdl, ...) \ - gD_(gdl, gsSPDma_io, __VA_ARGS__) -# define gSPDmaRead(gdl, ...) \ - gD_(gdl, gsSPDmaRead, __VA_ARGS__) -# define gSPDmaWrite(gdl, ...) \ - gD_(gdl, gsSPDmaWrite, __VA_ARGS__) -#endif -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -# define gLoadUcode(gdl, ...) \ - gD_(gdl, gsLoadUcode, __VA_ARGS__) -# define gSPLoadUcodeEx(gdl, ...) \ - gD_(gdl, gsSPLoadUcodeEx, __VA_ARGS__) -#endif -#define gTexRect(gdl, ...) \ - gD_(gdl, gsTexRect, __VA_ARGS__) -#define gTexRectFlip(gdl, ...) \ - gD_(gdl, gsTexRectFlip, __VA_ARGS__) -#define gSPNoOp(gdl) \ - gDisplayListPut(gdl, gsSPNoOp()) -#define gDPWord(gdl, ...) \ - gD_(gdl, gsDPWord, __VA_ARGS__) -#if defined(F3DEX_GBI_2) -# define gSpecial3(gdl, ...) \ - gD_(gdl, gsSpecial3, __VA_ARGS__) -# define gSpecial2(gdl, ...) \ - gD_(gdl, gsSpecial2, __VA_ARGS__) -# define gSpecial1(gdl, ...) \ - gD_(gdl, gsSpecial1, __VA_ARGS__) -#endif - -/* data types and structures */ -typedef uint8_t qu08_t; -typedef uint16_t qu016_t; -typedef int16_t qs48_t; -typedef int16_t qs510_t; -typedef uint16_t qu510_t; -typedef int16_t qs102_t; -typedef uint16_t qu102_t; -typedef int16_t qs105_t; -typedef uint16_t qu105_t; -typedef int16_t qs132_t; -typedef int16_t qs142_t; -typedef int32_t qs1516_t; -typedef int32_t qs1616_t; -typedef int32_t qs205_t; - -typedef uint16_t g_bglt_t; -typedef uint8_t g_ifmt_t; -typedef uint8_t g_isiz_t; -typedef uint16_t g_bgf_t; -typedef uint8_t g_objf_t; -typedef uint32_t g_objlt_t; - -typedef struct -{ - _Alignas(8) - uint32_t hi; - uint32_t lo; -} Gfx; - -typedef struct -{ - int32_t x1; - int32_t y1; - int32_t x2; - int32_t y2; -} Hilite_t; - -typedef union -{ - _Alignas(8) - Hilite_t h; -} Hilite; - -typedef int32_t Mtx_t[4][4]; - -typedef union -{ - _Alignas(8) - Mtx_t m; - int32_t l[16]; - struct - { - int16_t i[16]; - uint16_t f[16]; - }; -} Mtx; - -typedef struct -{ - uint8_t col[3]; - char pad1; - uint8_t colc[3]; - char pad2; - int8_t dir[3]; - char pad3; -} Light_t; - -typedef union -{ - _Alignas(8) - Light_t l; -} Light; - -typedef struct -{ - Light l[2]; -} LookAt; - -typedef struct -{ - uint8_t col[3]; - char pad1; - uint8_t colc[3]; - char pad2; -} Ambient_t; - -typedef union -{ - _Alignas(8) - Ambient_t l; -} Ambient; - -typedef struct -{ - Ambient a; - Light l[1]; -} Lights0, Lights1; - -typedef struct -{ - Ambient a; - Light l[2]; -} Lights2; - -typedef struct -{ - Ambient a; - Light l[3]; -} Lights3; - -typedef struct -{ - Ambient a; - Light l[4]; -} Lights4; - -typedef struct -{ - Ambient a; - Light l[5]; -} Lights5; - -typedef struct -{ - Ambient a; - Light l[6]; -} Lights6; - -typedef struct -{ - Ambient a; - Light l[7]; -} Lightsn, Lights7; - -typedef struct -{ - int16_t ob[3]; - uint16_t flag; - qs105_t tc[2]; - uint8_t cn[4]; -} Vtx_t; - -typedef struct -{ - int16_t ob[3]; - uint16_t flag; - qs105_t tc[2]; - int8_t n[3]; - uint8_t a; -} Vtx_tn; - -typedef union -{ - _Alignas(8) - Vtx_t v; - Vtx_tn n; -} Vtx; - -typedef struct -{ - qs142_t vscale[4]; - qs142_t vtrans[4]; -} Vp_t; - -typedef union -{ - _Alignas(8) - Vp_t vp; -} Vp; - -typedef struct -{ - qs1516_t A; - qs1516_t B; - qs1516_t C; - qs1516_t D; - qs102_t X; - qs102_t Y; - qu510_t BaseScaleX; - qu510_t BaseScaleY; -} uObjMtx_t; - -typedef union -{ - _Alignas(8) - uObjMtx_t m; -} uObjMtx; - -typedef struct -{ - qs102_t X; - qs102_t Y; - qu510_t BaseScaleX; - qu510_t BaseScaleY; -} uObjSubMtx_t; - -typedef union -{ - _Alignas(8) - uObjSubMtx_t m; -} uObjSubMtx; - -typedef struct -{ - qu105_t imageX; - qu102_t imageW; - qs102_t frameX; - qu102_t frameW; - qu105_t imageY; - qu102_t imageH; - qs102_t frameY; - qu102_t frameH; - uint64_t * imagePtr; - g_bglt_t imageLoad; - g_ifmt_t imageFmt; - g_isiz_t imageSiz; - uint16_t imagePal; - g_bgf_t imageFlip; - uint16_t tmemW; - qs132_t tmemH; - uint16_t tmemLoadSH; - uint16_t tmemLoadTH; - uint16_t tmemSizeW; - uint16_t tmemSize; -} uObjBg_t; - -typedef struct -{ - qu105_t imageX; - qu102_t imageW; - qs102_t frameX; - qu102_t frameW; - qu105_t imageY; - qu102_t imageH; - qs102_t frameY; - qu102_t frameH; - uint64_t * imagePtr; - g_bglt_t imageLoad; - g_ifmt_t imageFmt; - g_isiz_t imageSiz; - uint16_t imagePal; - g_bgf_t imageFlip; - qu510_t scaleW; - qu510_t scaleH; - qs205_t imageYorig; - char padding[4]; -} uObjScaleBg_t; - -typedef union -{ - _Alignas(8) - uObjBg_t b; - uObjScaleBg_t s; -} uObjBg; - -typedef struct -{ - qs102_t objX; - qu510_t scaleW; - qu105_t imageW; - uint16_t paddingX; - qs102_t objY; - qu510_t scaleH; - qu105_t imageH; - uint16_t paddingY; - uint16_t imageStride; - uint16_t imageAdrs; - g_ifmt_t imageFmt; - g_isiz_t imageSiz; - uint16_t imagePal; - g_objf_t imageFlags; -} uObjSprite_t; - -typedef union -{ - _Alignas(8) - uObjSprite_t s; -} uObjSprite; - -typedef struct -{ - g_objlt_t type; - uint64_t * image; - uint16_t tmem; - uint16_t tsize; - uint16_t tline; - uint16_t sid; - uint32_t flag; - uint32_t mask; -} uObjTxtrBlock_t; - -typedef struct -{ - g_objlt_t type; - uint64_t * image; - uint16_t tmem; - uint16_t twidth; - uint16_t theight; - uint16_t sid; - uint32_t flag; - uint32_t mask; -} uObjTxtrTile_t; - -typedef struct -{ - g_objlt_t type; - uint64_t * image; - uint16_t phead; - uint16_t pnum; - uint16_t zero; - uint16_t sid; - uint32_t flag; - uint32_t mask; -} uObjTxtrTLUT_t; - -typedef union -{ - _Alignas(8) - uObjTxtrBlock_t block; - uObjTxtrTile_t tile; - uObjTxtrTLUT_t tlut; -} uObjTxtr; - -typedef struct -{ - uObjTxtr txtr; - uObjSprite sprite; -} uObjTxSprite; - -/* rectangle scissoring macros */ -#define gScC_(c) ((c) < 0 ? 0 : (c)) -#define gScD_(t, c, d) \ - ( \ - (c) < 0 ? \ - ( \ - (d) < 0 ? \ - (t) + (c) * (d) / 0x80 : \ - (t) - (c) * (d) / 0x80 \ - ) : \ - (t) \ - ) - -/* texture loading helper macros */ -#define G_SIZ_LDSIZ(siz) ((siz) < G_IM_SIZ_16b ? G_IM_SIZ_16b : (siz)) -#define G_SIZ_BITS(siz) (4 << gI_(siz)) -#define G_SIZ_LDBITS(siz) ((siz) < G_IM_SIZ_16b ? G_SIZ_BITS(siz) : 16) -#define G_DXT(siz, width) \ - ( \ - (width) * G_SIZ_BITS(siz) > 64 ? \ - ((1 << 11) + (width) * G_SIZ_BITS(siz) / 64 - 1) / \ - ((width) * G_SIZ_BITS(siz) / 64) : \ - (1 << 11) \ - ) -#define G_LTB_LRS(width, height, siz) \ - ( \ - (((width) * (height) + 1) * G_SIZ_BITS(siz) - 1) / \ - G_SIZ_BITS(G_SIZ_LDSIZ(siz)) - 1 \ - ) -#define G_LDBLK_TXL(txl) \ - ( \ - (txl) > G_TX_LDBLK_MAX_TXL ? \ - G_TX_LDBLK_MAX_TXL : \ - (txl) \ - ) - -/* depth value macros */ -#define gZp_(zval, near, far) \ - ( \ - (1.f - (float)(near) / (float)(zval)) / \ - (1.f - (float)(near) / (float)(far)) \ - ) -#define gZo_(zval, near, far) \ - ( \ - ((float)(zval) - (float)(near)) / \ - ((float)(far) - (float)(near)) \ - ) -#define gZf_(zval, near, far, flag) \ - qs1616 \ - ( \ - (flag) == G_BZ_PERSP ? \ - gZp_(zval, near, far) : \ - gZo_(zval, near, far) \ - ) -#define G_DEPTOZSrg(zval, near, far, flag, zmin, zmax) \ - ( \ - gZf_(zval, near, far, flag) * \ - ((int32_t)((zmax) - (zmin)) & ~(int32_t)1) + \ - qs1616(zmin) \ - ) -#define G_DEPTOZS(zval, near, far, flag) \ - G_DEPTOZSrg(zval, near, far, flag, 0, G_MAXZ) - -/* vertex ordering macros */ -#define gV2_(v0, v1, flag) \ - ( \ - (flag) == 0 ? gI_(v0) : \ - gI_(v1) \ - ) -#define gV3_(v0, v1, v2, flag) \ - ( \ - (flag) == 0 ? gI_(v0) : \ - (flag) == 1 ? gI_(v1) : \ - gI_(v2) \ - ) -#define gV4_(v0, v1, v2, v3, flag) \ - ( \ - (flag) == 0 ? gI_(v0) : \ - (flag) == 1 ? gI_(v1) : \ - (flag) == 2 ? gI_(v2) : \ - gI_(v3) \ - ) - -/* sprite texture parameter macros */ -#define GS_PIX2TMEM(pix, siz) ((pix) * G_SIZ_BITS(siz) / 64) -#define GS_TB_TSIZE(pix, siz) (GS_PIX2TMEM(pix, siz) - 1) -#define GS_TB_TLINE(pix, siz) (((1 << 11) - 1) / GS_PIX2TMEM(pix, siz) + 1) -#define GS_TT_TWIDTH(pix, siz) (GS_PIX2TMEM(pix, siz) * 4 - 1) -#define GS_TT_THEIGHT(pix, siz) ((pix) * 4 - 1) -#define GS_PAL_HEAD(head) ((head) + 256) -#define GS_PAL_NUM(num) ((num) - 1) - -/* fixed-point conversion macros */ -#define qu08(n) ((qu08_t)((n) * 0x100)) -#define qu016(n) ((qu016_t)((n) * 0x10000)) -#define qs48(n) ((qs48_t)((n) * 0x0100)) -#define qs510(n) ((qs510_t)((n) * 0x0400)) -#define qu510(n) ((qu510_t)((n) * 0x0400)) -#define qs102(n) ((qs102_t)((n) * 0x0004)) -#define qu102(n) ((qu102_t)((n) * 0x0004)) -#define qs105(n) ((qs105_t)((n) * 0x0020)) -#define qu105(n) ((qu105_t)((n) * 0x0020)) -#define qs132(n) ((qs132_t)((n) * 0x0004)) -#define qs142(n) ((qs142_t)((n) * 0x0004)) -#define qs1516(n) ((qs1516_t)((n) * 0x00010000)) -#define qs1616(n) ((qs1616_t)((n) * 0x00010000)) -#define qs205(n) ((qs205_t)((n) * 0x00000020)) - -/* private helper macros */ -#define gI_(i) ((uint32_t)(i)) -#define gL_(l) ((uint64_t)(l)) -#define gF_(i, n, s) ((gI_(i) & ((gI_(1) << (n)) - 1)) << (s)) -#define gFL_(l, n, s) ((gL_(l) & ((gL_(1) << (n)) - 1)) << (s)) -#define gO_(opc, hi, lo) ((Gfx){gF_(opc, 8, 24) | gI_(hi), gI_(lo)}) -#define gD_(gdl, m, ...) gDisplayListPut(gdl, m(__VA_ARGS__)) - -#endif diff --git a/ZAPDTR/lib/libgfxd/gfxd.c b/ZAPDTR/lib/libgfxd/gfxd.c deleted file mode 100644 index 76d7ded8a..000000000 --- a/ZAPDTR/lib/libgfxd/gfxd.c +++ /dev/null @@ -1,863 +0,0 @@ -#include -#include -#include -#include -#include -#ifdef _WIN32 -# include -# define read _read -# define write _write -#else -# include -#endif -#include "gbi.h" -#include "gfxd.h" -#include "priv.h" - -static TLOCAL struct gfxd_state state; - -static int buffer_input_fn(void *buf, int count) -{ - if (count > config.input_buf_size) - count = config.input_buf_size; - memcpy(buf, config.input_buf, count); - config.input_buf += count; - config.input_buf_size -= count; - return count; -} - -static int buffer_output_fn(const char *buf, int count) -{ - if (count > config.output_buf_size) - count = config.output_buf_size; - memcpy(config.output_buf, buf, count); - config.output_buf += count; - config.output_buf_size -= count; - return count; -} - -static int fd_input_fn(void *buf, int count) -{ - return read(config.input_fd, buf, count); -} - -static int fd_output_fn(const char *buf, int count) -{ - return write(config.output_fd, buf, count); -} - -static void swap_words(Gfx *gfx) -{ - uint8_t b[8]; - uint8_t *pw = (void *) gfx; - uint8_t *pb = b; - - int endian = config.endian; - int wordsize = config.wordsize; - - for (int i = 0; i < 8 / wordsize; i++) - { - if (endian == gfxd_endian_host) - { - switch (wordsize) - { - case 1: - { - uint8_t w = *(uint8_t *) pw; - *pb++ = w >> 0; - break; - } - case 2: - { - uint16_t w = *(uint16_t *) pw; - *pb++ = w >> 8; - *pb++ = w >> 0; - break; - } - case 4: - { - uint32_t w = *(uint32_t *) pw; - *pb++ = w >> 24; - *pb++ = w >> 16; - *pb++ = w >> 8; - *pb++ = w >> 0; - break; - } - case 8: - { - uint64_t w = *(uint64_t *) pw; - *pb++ = w >> 56; - *pb++ = w >> 48; - *pb++ = w >> 40; - *pb++ = w >> 32; - *pb++ = w >> 24; - *pb++ = w >> 16; - *pb++ = w >> 8; - *pb++ = w >> 0; - break; - } - } - } - else - { - for (int j = 0; j < wordsize; j++) - { - if (endian == gfxd_endian_little) - *pb++ = pw[wordsize - 1 - j]; - else - *pb++ = pw[j]; - } - } - pw += wordsize; - } - - gfx->hi = ((uint32_t) b[0] << 24) - | ((uint32_t) b[1] << 16) - | ((uint32_t) b[2] << 8) - | ((uint32_t) b[3] << 0); - gfx->lo = ((uint32_t) b[4] << 24) - | ((uint32_t) b[5] << 16) - | ((uint32_t) b[6] << 8) - | ((uint32_t) b[7] << 0); -} - -static void get_more_input(void) -{ - if (state.end_input != 0) - return; - - char *recv_buf = (void *) &state.gfx[0]; - - while (state.n_gfx < sizeof(state.gfx) / sizeof(state.gfx[0])) - { - int n_read = sizeof(state.gfx) - state.n_byte; - n_read = config.input_fn(&recv_buf[state.n_byte], n_read); - if (n_read == 0) - return; - state.n_byte += n_read; - - while (state.n_gfx < state.n_byte / sizeof(Gfx)) - { - Gfx gfx = state.gfx[state.n_gfx]; - gfxd_macro_t *m = &state.macro[state.n_gfx]; - - swap_words(&gfx); - - int ret = config.ucode->disas_fn(m, gfx.hi, gfx.lo); - if (ret != 0 && config.stop_on_invalid != 0) - { - state.end_input = 1; - state.ret = ret; - return; - } - - state.n_gfx++; - } - } -} - -static int32_t typed_arg_i(int type, int idx) -{ - const gfxd_value_t *v = gfxd_value_by_type(type, idx); - if (v != NULL) - return v->i; - else - return -1; -} - -static uint32_t typed_arg_u(int type, int idx) -{ - const gfxd_value_t *v = gfxd_value_by_type(type, idx); - if (v != NULL) - return v->u; - else - return 0; -} - - -TLOCAL struct gfxd_config config = -{ - .ucode = NULL, - .endian = gfxd_endian_big, - .wordsize = 4, - .arg = NULL, - - .stop_on_invalid = 1, - .stop_on_end = 1, - .emit_dec_color = 0, - .emit_q_macro = 0, - .emit_ext_macro = 0, - - .input_buf = NULL, - .input_buf_size = 0, - .input_fn = &buffer_input_fn, - - .output_buf = NULL, - .output_buf_size = 0, - .output_fn = &buffer_output_fn, - - .macro_fn = &gfxd_macro_dflt, - .arg_fn = &gfxd_arg_dflt, - - .tlut_fn = NULL, - .timg_fn = NULL, - .cimg_fn = NULL, - .zimg_fn = NULL, - .dl_fn = NULL, - .mtx_fn = NULL, - .lookat_fn = NULL, - .light_fn = NULL, - .seg_fn = NULL, - .vtx_fn = NULL, - .vp_fn = NULL, - .uctext_fn = NULL, - .ucdata_fn = NULL, - .dram_fn = NULL, -}; - -void gfxd_input_buffer(const void *buf, int size) -{ - config.input_buf = buf; - config.input_buf_size = size; - config.input_fn = &buffer_input_fn; -} - -void gfxd_output_buffer(char *buf, int size) -{ - config.output_buf = buf; - config.output_buf_size = size; - config.output_fn = &buffer_output_fn; -} - -void gfxd_input_fd(int fd) -{ - config.input_fd = fd; - config.input_fn = &fd_input_fn; -} - -void gfxd_output_fd(int fd) -{ - config.output_fd = fd; - config.output_fn = &fd_output_fn; -} - -void gfxd_input_callback(gfxd_input_fn_t *fn) -{ - if (fn != NULL) - config.input_fn = fn; - else - gfxd_input_buffer(NULL, 0); -} - -void gfxd_output_callback(gfxd_output_fn_t *fn) -{ - if (fn != NULL) - config.output_fn = fn; - else - gfxd_output_buffer(NULL, 0); -} - -void gfxd_macro_fn(gfxd_macro_fn_t *fn) -{ - if (fn != NULL) - config.macro_fn = fn; - else - config.macro_fn = gfxd_macro_dflt; -} - -void gfxd_arg_fn(gfxd_arg_fn_t *fn) -{ - if (fn != NULL) - config.arg_fn = fn; - else - config.arg_fn = gfxd_arg_dflt; -} - -int gfxd_write(const void *buf, int count) -{ - return config.output_fn(buf, count); -} - -int gfxd_puts(const char *str) -{ - return gfxd_write(str, strlen(str)); -} - -int gfxd_printf(const char *fmt, ...) -{ - char s[256]; - - va_list arg; - va_start(arg, fmt); - int n = vsnprintf(s, sizeof(s), fmt, arg); - va_end(arg); - - if (n > sizeof(s) - 1) - n = sizeof(s) - 1; - - return gfxd_write(s, n); -} - -int gfxd_print_value(int type, const gfxd_value_t *value) -{ - return config.ucode->arg_tbl[type].fn(value); -} - -int gfxd_macro_dflt(void) -{ - gfxd_macro_t *m = &state.macro[0]; - const gfxd_macro_type_t *t = &config.ucode->macro_tbl[m->id]; - - const char *name = gfxd_macro_name(); - if (name == NULL) - { - if (config.arg != NULL) - { - gfxd_puts(config.arg); - gfxd_puts(" = "); - } - - gfxd_puts("(Gfx){"); - } - else - { - gfxd_puts(name); - gfxd_puts("("); - - if (config.arg != NULL) - { - gfxd_puts(config.arg); - if (t->n_arg != 0) - gfxd_puts(", "); - } - } - - for (int i = 0; i < t->n_arg; i++) - { - if (i != 0) - gfxd_puts(", "); - - config.arg_fn(i); - } - - if (name == NULL) - gfxd_puts("}"); - else - gfxd_puts(")"); - - return 0; -} - -int gfxd_arg_callbacks(int arg_num) -{ - int id = gfxd_macro_id(); - - switch (gfxd_arg_type(arg_num)) - { - case gfxd_Tlut: - { - if (config.tlut_fn != NULL) - { - int32_t num; - if (id == gfxd_DPLoadTLUT_pal16) - num = 16; - else if (id == gfxd_DPLoadTLUT_pal256) - num = 256; - else - num = typed_arg_i(gfxd_Num, 0); - return config.tlut_fn( - typed_arg_u(gfxd_Tlut, 0), - typed_arg_i(gfxd_Pal, 0), - num); - } - break; - } - case gfxd_Timg: - { - if (config.timg_fn != NULL) - { - int32_t siz = typed_arg_i(gfxd_Siz, 0); - if (siz == -1) - siz = G_IM_SIZ_4b; - return config.timg_fn( - typed_arg_u(gfxd_Timg, 0), - typed_arg_i(gfxd_Fmt, 0), - siz, - typed_arg_i(gfxd_Dim, 0), - typed_arg_i(gfxd_Dim, 1), - typed_arg_i(gfxd_Pal, 0)); - } - break; - } - case gfxd_Cimg: - { - if (config.cimg_fn != NULL) - { - return config.cimg_fn( - typed_arg_u(gfxd_Cimg, 0), - typed_arg_i(gfxd_Fmt, 0), - typed_arg_i(gfxd_Siz, 0), - typed_arg_i(gfxd_Dim, 0)); - } - break; - } - case gfxd_Zimg: - { - if (config.zimg_fn != NULL) - { - return config.zimg_fn( - typed_arg_u(gfxd_Zimg, 0)); - } - break; - } - case gfxd_Dl: - { - if (config.dl_fn != NULL) - { - return config.dl_fn( - typed_arg_u(gfxd_Dl, 0)); - } - break; - } - case gfxd_Mtxptr: - { - if (config.mtx_fn != NULL) - { - return config.mtx_fn( - typed_arg_u(gfxd_Mtxptr, 0)); - } - break; - } - case gfxd_Lookatptr: - { - if (config.lookat_fn != NULL) - { - int32_t num; - if (id == gfxd_SPLookAt) - num = 2; - else - num = 1; - return config.lookat_fn( - typed_arg_u(gfxd_Lookatptr, 0), - num); - } - break; - } - case gfxd_Lightptr: - { - if (config.light_fn != NULL) - { - int32_t num; - if (id == gfxd_SPSetLights1) - num = 1; - else if (id == gfxd_SPSetLights2) - num = 2; - else if (id == gfxd_SPSetLights3) - num = 3; - else if (id == gfxd_SPSetLights4) - num = 4; - else if (id == gfxd_SPSetLights5) - num = 5; - else if (id == gfxd_SPSetLights6) - num = 6; - else if (id == gfxd_SPSetLights7) - num = 7; - else - num = 1; - return config.light_fn( - typed_arg_u(gfxd_Lightptr, 0), - num); - } - break; - - } - case gfxd_Segptr: - { - if (config.seg_fn != NULL) - { - return config.seg_fn( - typed_arg_u(gfxd_Segptr, 0), - typed_arg_i(gfxd_Seg, 0)); - } - break; - } - case gfxd_Vtxptr: - { - if (config.vtx_fn != NULL) - { - return config.vtx_fn( - typed_arg_u(gfxd_Vtxptr, 0), - typed_arg_i(gfxd_Num, 0)); - } - break; - } - case gfxd_Vpptr: - { - if (config.vp_fn != NULL) - { - return config.vp_fn( - typed_arg_u(gfxd_Vpptr, 0)); - } - break; - } - case gfxd_Uctext: - { - if (config.uctext_fn != NULL) - { - return config.uctext_fn( - typed_arg_u(gfxd_Uctext, 0), - 0x1000); - } - break; - } - case gfxd_Ucdata: - { - if (config.ucdata_fn != NULL) - { - uint32_t size; - if (id == gfxd_SPLoadUcodeEx) - size = typed_arg_u(gfxd_Size, 0); - else - size = 0x800; - return config.ucdata_fn( - typed_arg_u(gfxd_Ucdata, 0), - size); - } - break; - } - case gfxd_Dram: - { - if (config.dram_fn != NULL) - { - return config.dram_fn( - typed_arg_u(gfxd_Dram, 0), - typed_arg_u(gfxd_Size, 0)); - } - break; - } - } - - return 0; -} - -void gfxd_arg_dflt(int arg_num) -{ - if (gfxd_arg_callbacks(arg_num) == 0) - { - gfxd_arg_t *a = &state.macro[0].arg[arg_num]; - - gfxd_print_value(a->type, &a->value); - } -} - -void gfxd_tlut_callback(gfxd_tlut_fn_t *fn) -{ - config.tlut_fn = fn; -} - -void gfxd_timg_callback(gfxd_timg_fn_t *fn) -{ - config.timg_fn = fn; -} - -void gfxd_cimg_callback(gfxd_cimg_fn_t *fn) -{ - config.cimg_fn = fn; -} - -void gfxd_zimg_callback(gfxd_zimg_fn_t *fn) -{ - config.zimg_fn = fn; -} - -void gfxd_dl_callback(gfxd_dl_fn_t *fn) -{ - config.dl_fn = fn; -} - -void gfxd_mtx_callback(gfxd_mtx_fn_t *fn) -{ - config.mtx_fn = fn; -} - -void gfxd_lookat_callback(gfxd_lookat_fn_t *fn) -{ - config.lookat_fn = fn; -} - -void gfxd_light_callback(gfxd_light_fn_t *fn) -{ - config.light_fn = fn; -} - -void gfxd_seg_callback(gfxd_seg_fn_t *fn) -{ - config.seg_fn = fn; -} - -void gfxd_vtx_callback(gfxd_vtx_fn_t *fn) -{ - config.vtx_fn = fn; -} - -void gfxd_vp_callback(gfxd_vp_fn_t *fn) -{ - config.vp_fn = fn; -} - -void gfxd_uctext_callback(gfxd_uctext_fn_t *fn) -{ - config.uctext_fn = fn; -} - -void gfxd_ucdata_callback(gfxd_ucdata_fn_t *fn) -{ - config.ucdata_fn = fn; -} - -void gfxd_dram_callback(gfxd_dram_fn_t *fn) -{ - config.dram_fn = fn; -} - -void gfxd_target(gfxd_ucode_t ucode) -{ - config.ucode = ucode; -} - -void gfxd_endian(int endian, int wordsize) -{ - config.endian = endian; - config.wordsize = wordsize; -} - -void gfxd_dynamic(const char *arg) -{ - config.arg = arg; -} - -void gfxd_enable(int cap) -{ - switch (cap) - { - case gfxd_stop_on_invalid: - config.stop_on_invalid = 1; - break; - - case gfxd_stop_on_end: - config.stop_on_end = 1; - break; - - case gfxd_emit_dec_color: - config.emit_dec_color = 1; - break; - - case gfxd_emit_q_macro: - config.emit_q_macro = 1; - break; - - case gfxd_emit_ext_macro: - config.emit_ext_macro = 1; - break; - } -} - -void gfxd_disable(int cap) -{ - switch (cap) - { - case gfxd_stop_on_invalid: - config.stop_on_invalid = 0; - return; - - case gfxd_stop_on_end: - config.stop_on_end = 0; - return; - - case gfxd_emit_dec_color: - config.emit_dec_color = 0; - break; - - case gfxd_emit_q_macro: - config.emit_q_macro = 0; - break; - - case gfxd_emit_ext_macro: - config.emit_ext_macro = 0; - break; - } -} - -void gfxd_udata_set(void *ptr) -{ - config.udata = ptr; -} - -void *gfxd_udata_get(void) -{ - return config.udata; -} - -int gfxd_execute(void) -{ - state.macro_offset = 0; - state.n_byte = 0; - state.n_gfx = 0; - state.end_input = 0; - state.ret = 0; - - for (;;) - { - get_more_input(); - if (state.n_gfx == 0) - break; - - gfxd_macro_t *m = &state.macro[0]; - config.ucode->combine_fn(m, state.n_gfx); - - const gfxd_macro_type_t *t = &config.ucode->macro_tbl[m->id]; - if (t->ext != 0 && config.emit_ext_macro == 0) - { - Gfx gfx = state.gfx[0]; - swap_words(&gfx); - - t = &config.ucode->macro_tbl[gfxd_Invalid]; - t->disas_fn(m, gfx.hi, gfx.lo); - } - - int ret = config.macro_fn(); - if (ret != 0) - { - state.ret = ret; - break; - } - - if (config.stop_on_end != 0 - && (m->id == gfxd_SPBranchList - || m->id == gfxd_SPEndDisplayList)) - { - break; - } - - int n_pop = config.ucode->macro_tbl[m->id].n_gfx; - int n_rem = state.n_gfx - n_pop; - { - int n_byte = n_rem * sizeof(gfxd_macro_t); - memmove(&state.macro[0], &state.macro[n_pop], n_byte); - state.n_gfx = n_rem; - } - { - int n_byte = n_rem * sizeof(Gfx); - memmove(&state.gfx[0], &state.gfx[n_pop], n_byte); - state.n_byte = n_byte; - } - state.macro_offset += n_pop * sizeof(Gfx); - } - - return state.ret; -} - -int gfxd_macro_offset(void) -{ - return state.macro_offset; -} - -int gfxd_macro_packets(void) -{ - return config.ucode->macro_tbl[state.macro[0].id].n_gfx; -} - -const void *gfxd_macro_data(void) -{ - return state.gfx; -} - -int gfxd_macro_id(void) -{ - return state.macro[0].id; -} - -const char *gfxd_macro_name(void) -{ - int id = state.macro[0].id; - const gfxd_macro_type_t *t = &config.ucode->macro_tbl[id]; - - if (t->prefix == NULL && t->suffix == NULL) - { - return NULL; - } - else - { - static TLOCAL char buf[32]; - - char *p = buf; - if (t->prefix != NULL) - { - const char *s = t->prefix; - while (*s != '\0') - *p++ = *s++; - } - *p++ = 'g'; - if (config.arg == NULL) - *p++ = 's'; - if (t->suffix != NULL) - { - const char *s = t->suffix; - while (*s != '\0') - *p++ = *s++; - } - *p++ = '\0'; - - return buf; - } -} - -int gfxd_arg_count(void) -{ - return config.ucode->macro_tbl[state.macro[0].id].n_arg; -} - -int gfxd_arg_type(int arg_num) -{ - return state.macro[0].arg[arg_num].type; -} - -const char *gfxd_arg_name(int arg_num) -{ - return state.macro[0].arg[arg_num].name; -} - -int gfxd_arg_fmt(int arg_num) -{ - return config.ucode->arg_tbl[state.macro[0].arg[arg_num].type].fmt; -} - -const gfxd_value_t *gfxd_arg_value(int arg_num) -{ - return &state.macro[0].arg[arg_num].value; -} - -const gfxd_value_t *gfxd_value_by_type(int type, int idx) -{ - gfxd_macro_t *m = &state.macro[0]; - const gfxd_macro_type_t *t = &config.ucode->macro_tbl[m->id]; - - for (int i = 0; i < t->n_arg; i++) - { - gfxd_arg_t *a = &m->arg[i]; - if (a->type == type) - { - if (idx == 0) - return &a->value; - else - idx--; - } - } - - return NULL; -} - -int gfxd_arg_valid(int arg_num) -{ - return state.macro[0].arg[arg_num].bad == 0; -} diff --git a/ZAPDTR/lib/libgfxd/gfxd.h b/ZAPDTR/lib/libgfxd/gfxd.h deleted file mode 100644 index 268bbfa10..000000000 --- a/ZAPDTR/lib/libgfxd/gfxd.h +++ /dev/null @@ -1,387 +0,0 @@ -#ifndef GFXD_H -#define GFXD_H -#include - -#ifdef __cplusplus -extern "C" -{ -#endif - -enum -{ - gfxd_Word, /* generic word */ - gfxd_Opcode, /* command opcode (G_*) */ - gfxd_Coordi, /* integer coordinate */ - gfxd_Coordq, /* fractional (q10.2) coordinate */ - gfxd_Pal, /* palette index */ - gfxd_Tlut, /* tlut pointer */ - gfxd_Timg, /* texture image pointer */ - gfxd_Tmem, /* tmem address */ - gfxd_Tile, /* tile index */ - gfxd_Fmt, /* texture format */ - gfxd_Siz, /* texture pixel size */ - gfxd_Dim, /* integer dimension (width / height) */ - gfxd_Cm, /* clamp and mirror flags */ - gfxd_Tm, /* tile mask */ - gfxd_Ts, /* tile shift */ - gfxd_Dxt, /* texture dxt */ - gfxd_Tag, /* generic tag */ - gfxd_Pm, /* pipeline mode */ - gfxd_Colorpart, /* color component */ - gfxd_Color, /* color */ - gfxd_Lodfrac, /* lod fraction (q0.8) */ - gfxd_Cimg, /* color image pointer */ - gfxd_Zimg, /* depth image pointer */ - gfxd_Ac, /* alpha compare mode */ - gfxd_Ad, /* alpha dither mode */ - gfxd_Cd, /* color dither mode */ - gfxd_Ccpre, /* color combiner preset index */ - gfxd_Ccmuxa, /* color mux operand (a) */ - gfxd_Ccmuxb, /* color mux operand (b) */ - gfxd_Ccmuxc, /* color mux operand (c) */ - gfxd_Ccmuxd, /* color mux operand (d) */ - gfxd_Acmuxabd, /* alpha mux operand (a, b, or d) */ - gfxd_Acmuxc, /* alpha mux operand (c) */ - gfxd_Cv, /* color convert operand */ - gfxd_Tc, /* texture convert mode */ - gfxd_Cyc, /* cycle type */ - gfxd_Zs, /* depth source mode */ - gfxd_Ck, /* combine key mode */ - gfxd_Keyscale, /* combine key scale */ - gfxd_Keywidth, /* combine key width */ - gfxd_Zi, /* integer depth */ - gfxd_Rm1, /* cycle 1 render mode */ - gfxd_Rm2, /* cycle 2 render mode */ - gfxd_Sc, /* scissor mode */ - gfxd_Td, /* texture detail mode */ - gfxd_Tf, /* texture filter mode */ - gfxd_Tl, /* texture LOD mode */ - gfxd_Tt, /* textuure LUT mode */ - gfxd_Tp, /* texture perspective mode */ - gfxd_Line, /* texture line size */ - gfxd_Vtx, /* vertex index */ - gfxd_Vtxflag, /* vertex flag */ - gfxd_Dl, /* display list pointer */ - gfxd_Zraw, /* raw depth value (q16.16) */ - gfxd_Dlflag, /* display list flag */ - gfxd_Cr, /* clip ratio */ - gfxd_Num, /* element count */ - gfxd_Fogz, /* fog factor */ - gfxd_Fogp, /* fog position (0 - 1000) */ - gfxd_Mtxptr, /* matrix pointer */ - gfxd_Gm, /* geometry mode */ - gfxd_Mwo_matrix, /* matrix moveword offset */ - gfxd_Linewd, /* line width (1.5 + q7.1) */ - gfxd_Uctext, /* microcode text pointer */ - gfxd_Ucdata, /* microcode data pointer */ - gfxd_Size, /* data size */ - gfxd_Lookatptr, /* lookat pointer */ - gfxd_Mtxparam, /* matrix param */ - gfxd_Mtxstack, /* matrix param (stack select only) */ - gfxd_Mwo_point, /* vertex moveword offset */ - gfxd_Wscale, /* w-component scale (perspnorm) */ - gfxd_Seg, /* segment number */ - gfxd_Segptr, /* segment pointer */ - gfxd_Lightsn, /* dereferenced Lighstn pointer */ - gfxd_Numlights, /* light count (NUMLIGHTS_*) */ - gfxd_Lightnum, /* light number (LIGHT_*) */ - gfxd_Lightptr, /* light pointer */ - gfxd_Tcscale, /* texture coordinate scale */ - gfxd_Switch, /* on-off value */ - gfxd_St, /* vertex coordinate (q10.5) */ - gfxd_Stdelta, /* vertex coordinate delta (q5.10) */ - gfxd_Vtxptr, /* vertex pointer */ - gfxd_Vpptr, /* viewport pointer */ - gfxd_Dram, /* generic dram address */ - gfxd_Sftlo, /* othermode lo shift */ - gfxd_Othermodelo, /* othermode lo value */ - gfxd_Sfthi, /* othermode hi shift */ - gfxd_Othermodehi, /* othermode hi value */ - gfxd_Mw, /* moveword index */ - gfxd_Mwo, /* moveword offset */ - gfxd_Mwo_clip, /* clip ratio moveword offset */ - gfxd_Mwo_lightcol, /* light color moveword offset */ - gfxd_Mv, /* movemem index */ - gfxd_Mvo, /* movemem offset */ - gfxd_Dmem, /* dmem address */ - gfxd_Dmaflag, /* dma io flag */ -}; - -enum -{ - gfxd_Invalid, - gfxd_DPFillRectangle, - gfxd_DPFullSync, - gfxd_DPLoadSync, - gfxd_DPTileSync, - gfxd_DPPipeSync, - gfxd_DPLoadTLUT_pal16, - gfxd_DPLoadTLUT_pal256, - gfxd_DPLoadMultiBlockYuvS, - gfxd_DPLoadMultiBlockYuv, - gfxd_DPLoadMultiBlock_4bS, - gfxd_DPLoadMultiBlock_4b, - gfxd_DPLoadMultiBlockS, - gfxd_DPLoadMultiBlock, - gfxd__DPLoadTextureBlockYuvS, - gfxd__DPLoadTextureBlockYuv, - gfxd__DPLoadTextureBlock_4bS, - gfxd__DPLoadTextureBlock_4b, - gfxd__DPLoadTextureBlockS, - gfxd__DPLoadTextureBlock, - gfxd_DPLoadTextureBlockYuvS, - gfxd_DPLoadTextureBlockYuv, - gfxd_DPLoadTextureBlock_4bS, - gfxd_DPLoadTextureBlock_4b, - gfxd_DPLoadTextureBlockS, - gfxd_DPLoadTextureBlock, - gfxd_DPLoadMultiTileYuv, - gfxd_DPLoadMultiTile_4b, - gfxd_DPLoadMultiTile, - gfxd__DPLoadTextureTileYuv, - gfxd__DPLoadTextureTile_4b, - gfxd__DPLoadTextureTile, - gfxd_DPLoadTextureTileYuv, - gfxd_DPLoadTextureTile_4b, - gfxd_DPLoadTextureTile, - gfxd_DPLoadBlock, - gfxd_DPNoOp, - gfxd_DPNoOpTag, - gfxd_DPPipelineMode, - gfxd_DPSetBlendColor, - gfxd_DPSetEnvColor, - gfxd_DPSetFillColor, - gfxd_DPSetFogColor, - gfxd_DPSetPrimColor, - gfxd_DPSetColorImage, - gfxd_DPSetDepthImage, - gfxd_DPSetTextureImage, - gfxd_DPSetAlphaCompare, - gfxd_DPSetAlphaDither, - gfxd_DPSetColorDither, - gfxd_DPSetCombineMode, - gfxd_DPSetCombineLERP, - gfxd_DPSetConvert, - gfxd_DPSetTextureConvert, - gfxd_DPSetCycleType, - gfxd_DPSetDepthSource, - gfxd_DPSetCombineKey, - gfxd_DPSetKeyGB, - gfxd_DPSetKeyR, - gfxd_DPSetPrimDepth, - gfxd_DPSetRenderMode, - gfxd_DPSetScissor, - gfxd_DPSetScissorFrac, - gfxd_DPSetTextureDetail, - gfxd_DPSetTextureFilter, - gfxd_DPSetTextureLOD, - gfxd_DPSetTextureLUT, - gfxd_DPSetTexturePersp, - gfxd_DPSetTile, - gfxd_DPSetTileSize, - gfxd_SP1Triangle, - gfxd_SP2Triangles, - gfxd_SP1Quadrangle, - gfxd_SPBranchLessZraw, - gfxd_SPBranchList, - gfxd_SPClipRatio, - gfxd_SPCullDisplayList, - gfxd_SPDisplayList, - gfxd_SPEndDisplayList, - gfxd_SPFogFactor, - gfxd_SPFogPosition, - gfxd_SPForceMatrix, - gfxd_SPSetGeometryMode, - gfxd_SPClearGeometryMode, - gfxd_SPLoadGeometryMode, - gfxd_SPInsertMatrix, - gfxd_SPLine3D, - gfxd_SPLineW3D, - gfxd_SPLoadUcode, - gfxd_SPLookAtX, - gfxd_SPLookAtY, - gfxd_SPLookAt, - gfxd_SPMatrix, - gfxd_SPModifyVertex, - gfxd_SPPerspNormalize, - gfxd_SPPopMatrix, - gfxd_SPPopMatrixN, - gfxd_SPSegment, - gfxd_SPSetLights1, - gfxd_SPSetLights2, - gfxd_SPSetLights3, - gfxd_SPSetLights4, - gfxd_SPSetLights5, - gfxd_SPSetLights6, - gfxd_SPSetLights7, - gfxd_SPNumLights, - gfxd_SPLight, - gfxd_SPLightColor, - gfxd_SPTexture, - gfxd_SPTextureRectangle, - gfxd_SPTextureRectangleFlip, - gfxd_SPVertex, - gfxd_SPViewport, - gfxd_DPLoadTLUTCmd, - gfxd_DPLoadTLUT, - gfxd_BranchZ, - gfxd_DisplayList, - gfxd_DPHalf1, - gfxd_DPHalf2, - gfxd_DPWord, - gfxd_DPLoadTile, - gfxd_SPGeometryMode, - gfxd_SPSetOtherMode, - gfxd_SPSetOtherModeLo, - gfxd_SPSetOtherModeHi, - gfxd_DPSetOtherMode, - gfxd_MoveWd, - gfxd_MoveMem, - gfxd_SPDma_io, - gfxd_SPDmaRead, - gfxd_SPDmaWrite, - gfxd_LoadUcode, - gfxd_SPLoadUcodeEx, - gfxd_TexRect, - gfxd_TexRectFlip, - gfxd_SPNoOp, - gfxd_Special3, - gfxd_Special2, - gfxd_Special1, -}; - -enum -{ - gfxd_stop_on_invalid, - gfxd_stop_on_end, - gfxd_emit_dec_color, - gfxd_emit_q_macro, - gfxd_emit_ext_macro, -}; - -enum -{ - gfxd_endian_big, - gfxd_endian_little, - gfxd_endian_host, -}; - -enum -{ - gfxd_argfmt_i, - gfxd_argfmt_u, - gfxd_argfmt_f, -}; - -typedef union -{ - int32_t i; - uint32_t u; - float f; -} gfxd_value_t; - -typedef const struct gfxd_ucode *gfxd_ucode_t; - -typedef int gfxd_input_fn_t(void *buf, int count); -void gfxd_input_buffer(const void *buf, int size); -void gfxd_input_fd(int fd); -void gfxd_input_callback(gfxd_input_fn_t *fn); - -typedef int gfxd_output_fn_t(const char *buf, int count); -void gfxd_output_buffer(char *buf, int size); -void gfxd_output_fd(int fd); -void gfxd_output_callback(gfxd_output_fn_t *fn); - -typedef int gfxd_macro_fn_t(void); -void gfxd_macro_fn(gfxd_macro_fn_t *fn); -gfxd_macro_fn_t gfxd_macro_dflt; - -typedef void gfxd_arg_fn_t(int arg_num); -void gfxd_arg_fn(gfxd_arg_fn_t *fn); -gfxd_arg_fn_t gfxd_arg_dflt; - -typedef int gfxd_tlut_fn_t(uint32_t tlut, int32_t idx, int32_t count); -void gfxd_tlut_callback(gfxd_tlut_fn_t *fn); - -typedef int gfxd_timg_fn_t(uint32_t timg, int32_t fmt, int32_t siz, - int32_t width, int32_t height, int32_t pal); -void gfxd_timg_callback(gfxd_timg_fn_t *fn); - -typedef int gfxd_cimg_fn_t(uint32_t cimg, int32_t fmt, int32_t siz, - int32_t width); -void gfxd_cimg_callback(gfxd_cimg_fn_t *fn); - -typedef int gfxd_zimg_fn_t(uint32_t zimg); -void gfxd_zimg_callback(gfxd_zimg_fn_t *fn); - -typedef int gfxd_dl_fn_t(uint32_t dl); -void gfxd_dl_callback(gfxd_dl_fn_t *fn); - -typedef int gfxd_mtx_fn_t(uint32_t mtx); -void gfxd_mtx_callback(gfxd_mtx_fn_t *fn); - -typedef int gfxd_lookat_fn_t(uint32_t lookat, int32_t count); -void gfxd_lookat_callback(gfxd_lookat_fn_t *fn); - -typedef int gfxd_light_fn_t(uint32_t light, int32_t count); -void gfxd_light_callback(gfxd_light_fn_t *fn); - -typedef int gfxd_seg_fn_t(uint32_t seg, int32_t num); -void gfxd_seg_callback(gfxd_seg_fn_t *fn); - -typedef int gfxd_vtx_fn_t(uint32_t vtx, int32_t num); -void gfxd_vtx_callback(gfxd_vtx_fn_t *fn); - -typedef int gfxd_vp_fn_t(uint32_t vp); -void gfxd_vp_callback(gfxd_vp_fn_t *fn); - -typedef int gfxd_uctext_fn_t(uint32_t text, uint32_t size); -void gfxd_uctext_callback(gfxd_uctext_fn_t *fn); - -typedef int gfxd_ucdata_fn_t(uint32_t data, uint32_t size); -void gfxd_ucdata_callback(gfxd_ucdata_fn_t *fn); - -typedef int gfxd_dram_fn_t(uint32_t dram, uint32_t size); -void gfxd_dram_callback(gfxd_dram_fn_t *fn); - -int gfxd_write(const void *buf, int count); -int gfxd_puts(const char *str); -int gfxd_printf(const char *fmt, ...); -int gfxd_print_value(int type, const gfxd_value_t *value); - -void gfxd_target(gfxd_ucode_t ucode); -void gfxd_endian(int endian, int wordsize); -void gfxd_dynamic(const char *arg); -void gfxd_enable(int cap); -void gfxd_disable(int cap); -void gfxd_udata_set(void *ptr); -void *gfxd_udata_get(void); - -int gfxd_execute(void); - -int gfxd_macro_offset(void); -int gfxd_macro_packets(void); -const void *gfxd_macro_data(void); -int gfxd_macro_id(void); -const char *gfxd_macro_name(void); - -int gfxd_arg_count(void); -int gfxd_arg_type(int arg_num); -const char *gfxd_arg_name(int arg_num); -int gfxd_arg_fmt(int arg_num); -const gfxd_value_t *gfxd_arg_value(int arg_num); -const gfxd_value_t *gfxd_value_by_type(int type, int idx); -int gfxd_arg_valid(int arg_num); -int gfxd_arg_callbacks(int arg_num); - -extern const gfxd_ucode_t gfxd_f3d; -extern const gfxd_ucode_t gfxd_f3db; -extern const gfxd_ucode_t gfxd_f3dex; -extern const gfxd_ucode_t gfxd_f3dexb; -extern const gfxd_ucode_t gfxd_f3dex2; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/ZAPDTR/lib/libgfxd/priv.h b/ZAPDTR/lib/libgfxd/priv.h deleted file mode 100644 index 34d96f675..000000000 --- a/ZAPDTR/lib/libgfxd/priv.h +++ /dev/null @@ -1,125 +0,0 @@ -#ifndef GFXD_PRIV_H -#define GFXD_PRIV_H -#include "gfxd.h" - -#define CONFIG_MT - -#ifdef CONFIG_MT -# ifdef _MSC_VER -# define TLOCAL __declspec(thread) -# else -# define TLOCAL _Thread_local -# endif -#else -#define TLOCAL -#endif - -#define UCFUNC static inline - -#define config gfxd_config__ - -typedef int gfxd_argfn_t(const gfxd_value_t *v); - -typedef struct -{ - int fmt; - gfxd_argfn_t * fn; -} gfxd_arg_type_t; - -typedef struct -{ - int type; - const char * name; - gfxd_value_t value; - int bad; -} gfxd_arg_t; - -typedef struct -{ - int id; - gfxd_arg_t arg[18]; -} gfxd_macro_t; - -typedef int gfxd_disas_fn_t(gfxd_macro_t *macro, uint32_t hi, uint32_t lo); -typedef int gfxd_combine_fn_t(gfxd_macro_t *macro, int n_macro); - -typedef struct -{ - const char * prefix; - const char * suffix; - int opcode; - int n_arg; - int n_gfx; - gfxd_disas_fn_t * disas_fn; - gfxd_combine_fn_t * combine_fn; - int alias; - int ext; -} gfxd_macro_type_t; - -struct gfxd_ucode -{ - gfxd_disas_fn_t * disas_fn; - gfxd_combine_fn_t * combine_fn; - const gfxd_arg_type_t * arg_tbl; - const gfxd_macro_type_t * macro_tbl; -}; - -struct gfxd_state -{ - int macro_offset; - - Gfx gfx[9]; - int n_byte; - int n_gfx; - gfxd_macro_t macro[9]; - - int end_input; - int ret; -}; - -struct gfxd_config -{ - gfxd_ucode_t ucode; - int endian; - int wordsize; - const char * arg; - void * udata; - - int stop_on_invalid; - int stop_on_end; - int emit_dec_color; - int emit_q_macro; - int emit_ext_macro; - - const char * input_buf; - int input_buf_size; - int input_fd; - gfxd_input_fn_t * input_fn; - - char * output_buf; - int output_buf_size; - int output_fd; - gfxd_output_fn_t * output_fn; - - gfxd_macro_fn_t * macro_fn; - gfxd_arg_fn_t * arg_fn; - - gfxd_tlut_fn_t * tlut_fn; - gfxd_timg_fn_t * timg_fn; - gfxd_cimg_fn_t * cimg_fn; - gfxd_zimg_fn_t * zimg_fn; - gfxd_dl_fn_t * dl_fn; - gfxd_mtx_fn_t * mtx_fn; - gfxd_lookat_fn_t * lookat_fn; - gfxd_light_fn_t * light_fn; - gfxd_seg_fn_t * seg_fn; - gfxd_vtx_fn_t * vtx_fn; - gfxd_vp_fn_t * vp_fn; - gfxd_uctext_fn_t * uctext_fn; - gfxd_ucdata_fn_t * ucdata_fn; - gfxd_dram_fn_t * dram_fn; -}; - -extern TLOCAL struct gfxd_config gfxd_config__; - -#endif diff --git a/ZAPDTR/lib/libgfxd/uc.c b/ZAPDTR/lib/libgfxd/uc.c deleted file mode 100644 index 7efb09105..000000000 --- a/ZAPDTR/lib/libgfxd/uc.c +++ /dev/null @@ -1,54 +0,0 @@ -#include -#include -#include -#include "gbi.h" -#include "gfxd.h" -#include "priv.h" - -#include "uc_argfn.c" -#include "uc_argtbl.c" -#include "uc_macrofn.c" -#include "uc_macrotbl.c" - -UCFUNC int disas(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int opcode = (hi >> 24) & 0xFF; - - for (int i = 0; i < sizeof(macro_tbl) / sizeof(macro_tbl[0]); i++) - { - const gfxd_macro_type_t *t = ¯o_tbl[i]; - if (t->disas_fn != NULL && t->opcode == opcode) - return t->disas_fn(m, hi, lo); - } - - return d_Invalid(m, hi, lo); -} - -UCFUNC int combine(gfxd_macro_t *m, int num) -{ - int opcode = macro_tbl[m->id].opcode; - - for (int i = 0; i < sizeof(macro_tbl) / sizeof(macro_tbl[0]); i++) - { - const gfxd_macro_type_t *t = ¯o_tbl[i]; - if (t->combine_fn != NULL - && t->opcode == opcode - && (t->ext == 0 || config.emit_ext_macro != 0)) - { - if (t->combine_fn(m, num) == 0) - return 0; - } - } - - return -1; -} - -static const struct gfxd_ucode uc = -{ - .disas_fn = disas, - .combine_fn = combine, - .arg_tbl = arg_tbl, - .macro_tbl = macro_tbl, -}; - -const gfxd_ucode_t uc_name = &uc; diff --git a/ZAPDTR/lib/libgfxd/uc_argfn.c b/ZAPDTR/lib/libgfxd/uc_argfn.c deleted file mode 100644 index f65feb60f..000000000 --- a/ZAPDTR/lib/libgfxd/uc_argfn.c +++ /dev/null @@ -1,1814 +0,0 @@ -#define MDMASK(md) ((((uint32_t)1 << G_MDSIZ_##md) - 1) << G_MDSFT_##md) -#define MDMASK_RM_C1 ((uint32_t)0xCCCC0000) -#define MDMASK_RM_C2 ((uint32_t)0x33330000) -#define MDMASK_RM_LO ((uint32_t)0x0000FFF8) - -UCFUNC int argfn_i(const gfxd_value_t *v) -{ - return gfxd_printf("%" PRIi32, v->i); -} - -UCFUNC int argfn_u(const gfxd_value_t *v) -{ - return gfxd_printf("%" PRIu32, v->u); -} - -UCFUNC int argfn_x8(const gfxd_value_t *v) -{ - return gfxd_printf("0x%02" PRIX32, v->u); -} - -UCFUNC int argfn_x16(const gfxd_value_t *v) -{ - return gfxd_printf("0x%04" PRIX32, v->u); -} - -UCFUNC int argfn_x32(const gfxd_value_t *v) -{ - return gfxd_printf("0x%08" PRIX32, v->u); -} - -UCFUNC int argfn_color(const gfxd_value_t *v) -{ - if (config.emit_dec_color) - return gfxd_printf("%" PRIu32, v->u); - else - return gfxd_printf("0x%02" PRIX32, v->u); -} - -UCFUNC int argfn_qu08(const gfxd_value_t *v) -{ - if (v->u == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qu08(%.16g)", v->u / 256.f); - else - return gfxd_printf("0x%02" PRIX32, v->u); -} - -UCFUNC int argfn_qu016(const gfxd_value_t *v) -{ - if (v->u == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qu016(%.16g)", v->u / 65536.f); - else - return gfxd_printf("0x%04" PRIX32, v->u); -} - -UCFUNC int argfn_qs48(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qs48(%.16g)", v->i / 256.f); - else - { - if (v->i < 0) - return gfxd_printf("-0x%04" PRIX32, (uint32_t)-v->i); - else - return gfxd_printf("0x%04" PRIX32, (uint32_t)v->i); - } -} - -UCFUNC int argfn_qs510(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qs510(%.16g)", v->i / 1024.f); - else - { - if (v->i < 0) - return gfxd_printf("-0x%04" PRIX32, (uint32_t)-v->i); - else - return gfxd_printf("0x%04" PRIX32, (uint32_t)v->i); - } -} - -UCFUNC int argfn_qu102(const gfxd_value_t *v) -{ - if (v->u == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qu102(%.16g)", v->u / 4.f); - else - return gfxd_printf("0x%04" PRIX32, v->u); -} - -UCFUNC int argfn_qs105(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qs105(%.16g)", v->i / 32.f); - else - { - if (v->i < 0) - return gfxd_printf("-0x%04" PRIX32, (uint32_t)-v->i); - else - return gfxd_printf("0x%04" PRIX32, (uint32_t)v->i); - } -} - -UCFUNC int argfn_qs1616(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("0"); - else if (config.emit_q_macro) - return gfxd_printf("qs1616(%.16g)", v->i / 65536.f); - else - { - if (v->i < 0) - return gfxd_printf("-0x%08" PRIX32, (uint32_t)-v->i); - else - return gfxd_printf("0x%08" PRIX32, (uint32_t)v->i); - } -} - -UCFUNC int argfn_opc(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_SPNOOP: - return gfxd_puts("G_SPNOOP"); - case G_MTX: - return gfxd_puts("G_MTX"); - case G_MOVEMEM: - return gfxd_puts("G_MOVEMEM"); - case G_VTX: - return gfxd_puts("G_VTX"); - case G_DL: - return gfxd_puts("G_DL"); - case G_RDPHALF_2: - return gfxd_puts("G_RDPHALF_2"); - case G_RDPHALF_1: - return gfxd_puts("G_RDPHALF_1"); -#if defined(F3D_BETA) && (defined(F3D_GBI) || defined(F3DEX_GBI)) - case G_PERSPNORM: - return gfxd_puts("G_PERSPNORM"); -#endif - case G_LINE3D: - return gfxd_puts("G_LINE3D"); -#if defined(F3D_GBI) || defined(F3DEX_GBI) - case G_CLEARGEOMETRYMODE: - return gfxd_puts("G_CLEARGEOMETRYMODE"); - case G_SETGEOMETRYMODE: - return gfxd_puts("G_SETGEOMETRYMODE"); -#endif - case G_ENDDL: - return gfxd_puts("G_ENDDL"); - case G_SETOTHERMODE_L: - return gfxd_puts("G_SETOTHERMODE_L"); - case G_SETOTHERMODE_H: - return gfxd_puts("G_SETOTHERMODE_H"); - case G_TEXTURE: - return gfxd_puts("G_TEXTURE"); - case G_MOVEWORD: - return gfxd_puts("G_MOVEWORD"); - case G_POPMTX: - return gfxd_puts("G_POPMTX"); - case G_CULLDL: - return gfxd_puts("G_CULLDL"); - case G_TRI1: - return gfxd_puts("G_TRI1"); - case G_NOOP: - return gfxd_puts("G_NOOP"); -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - case G_LOAD_UCODE: - return gfxd_puts("G_LOAD_UCODE"); - case G_BRANCH_Z: - return gfxd_puts("G_BRANCH_Z"); - case G_TRI2: - return gfxd_puts("G_TRI2"); -# if !(defined(F3D_BETA) && defined(F3DEX_GBI)) - case G_MODIFYVTX: - return gfxd_puts("G_MODIFYVTX"); -# endif -#endif -#if defined(F3DEX_GBI_2) - case G_QUAD: - return gfxd_puts("G_QUAD"); - case G_SPECIAL_3: - return gfxd_puts("G_SPECIAL_3"); - case G_SPECIAL_2: - return gfxd_puts("G_SPECIAL_2"); - case G_SPECIAL_1: - return gfxd_puts("G_SPECIAL_1"); - case G_DMA_IO: - return gfxd_puts("G_DMA_IO"); - case G_GEOMETRYMODE: - return gfxd_puts("G_GEOMETRYMODE"); -#endif - case G_TEXRECT: - return gfxd_puts("G_TEXRECT"); - case G_TEXRECTFLIP: - return gfxd_puts("G_TEXRECTFLIP"); - case G_RDPLOADSYNC: - return gfxd_puts("G_RDPLOADSYNC"); - case G_RDPPIPESYNC: - return gfxd_puts("G_RDPPIPESYNC"); - case G_RDPTILESYNC: - return gfxd_puts("G_RDPTILESYNC"); - case G_RDPFULLSYNC: - return gfxd_puts("G_RDPFULLSYNC"); - case G_SETKEYGB: - return gfxd_puts("G_SETKEYGB"); - case G_SETKEYR: - return gfxd_puts("G_SETKEYR"); - case G_SETCONVERT: - return gfxd_puts("G_SETCONVERT"); - case G_SETSCISSOR: - return gfxd_puts("G_SETSCISSOR"); - case G_SETPRIMDEPTH: - return gfxd_puts("G_SETPRIMDEPTH"); - case G_RDPSETOTHERMODE: - return gfxd_puts("G_RDPSETOTHERMODE"); - case G_LOADTLUT: - return gfxd_puts("G_LOADTLUT"); - case G_SETTILESIZE: - return gfxd_puts("G_SETTILESIZE"); - case G_LOADBLOCK: - return gfxd_puts("G_LOADBLOCK"); - case G_LOADTILE: - return gfxd_puts("G_LOADTILE"); - case G_SETTILE: - return gfxd_puts("G_SETTILE"); - case G_FILLRECT: - return gfxd_puts("G_FILLRECT"); - case G_SETFILLCOLOR: - return gfxd_puts("G_SETFILLCOLOR"); - case G_SETFOGCOLOR: - return gfxd_puts("G_SETFOGCOLOR"); - case G_SETBLENDCOLOR: - return gfxd_puts("G_SETBLENDCOLOR"); - case G_SETPRIMCOLOR: - return gfxd_puts("G_SETPRIMCOLOR"); - case G_SETENVCOLOR: - return gfxd_puts("G_SETENVCOLOR"); - case G_SETCOMBINE: - return gfxd_puts("G_SETCOMBINE"); - case G_SETTIMG: - return gfxd_puts("G_SETTIMG"); - case G_SETZIMG: - return gfxd_puts("G_SETZIMG"); - case G_SETCIMG: - return gfxd_puts("G_SETCIMG"); - default: - return gfxd_printf("0x%02" PRIX32, (uint32_t)v->i); - } -} - -UCFUNC int argfn_fmt(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_IM_FMT_RGBA: - return gfxd_puts("G_IM_FMT_RGBA"); - case G_IM_FMT_YUV: - return gfxd_puts("G_IM_FMT_YUV"); - case G_IM_FMT_CI: - return gfxd_puts("G_IM_FMT_CI"); - case G_IM_FMT_IA: - return gfxd_puts("G_IM_FMT_IA"); - case G_IM_FMT_I: - return gfxd_puts("G_IM_FMT_I"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_siz(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_IM_SIZ_4b: - return gfxd_puts("G_IM_SIZ_4b"); - case G_IM_SIZ_8b: - return gfxd_puts("G_IM_SIZ_8b"); - case G_IM_SIZ_16b: - return gfxd_puts("G_IM_SIZ_16b"); - case G_IM_SIZ_32b: - return gfxd_puts("G_IM_SIZ_32b"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_cm(const gfxd_value_t *v) -{ - int n = 0; - if (v->u & G_TX_MIRROR) - n += gfxd_puts("G_TX_MIRROR"); - else - n += gfxd_puts("G_TX_NOMIRROR"); - if (v->u & G_TX_CLAMP) - n += gfxd_puts(" | G_TX_CLAMP"); - else - n += gfxd_puts(" | G_TX_WRAP"); - return n; -} - -UCFUNC int argfn_tm(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("G_TX_NOMASK"); - else - return gfxd_printf("%" PRIi32, v->i); -} - -UCFUNC int argfn_ts(const gfxd_value_t *v) -{ - if (v->i == 0) - return gfxd_puts("G_TX_NOLOD"); - else - return gfxd_printf("%" PRIi32, v->i); -} - -UCFUNC int argfn_switch(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_ON: - return gfxd_puts("G_ON"); - case G_OFF: - return gfxd_puts("G_OFF"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_tile(const gfxd_value_t *v) -{ - if (v->i == G_TX_LOADTILE) - return gfxd_puts("G_TX_LOADTILE"); - else if (v->i == G_TX_RENDERTILE) - return gfxd_puts("G_TX_RENDERTILE"); - else - return gfxd_printf("%" PRIi32, v->i); -} - -UCFUNC int argfn_gm(const gfxd_value_t *v) -{ - int n = 0; - uint32_t arg = v->u; - if (arg & G_ZBUFFER) - n += gfxd_puts("G_ZBUFFER"); - if (arg & G_TEXTURE_ENABLE) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_TEXTURE_ENABLE"); - } - if (arg & G_SHADE) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_SHADE"); - } - if ((arg & G_CULL_BOTH) == G_CULL_BOTH) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_CULL_BOTH"); - } - else - { - if (arg & G_CULL_FRONT) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_CULL_FRONT"); - } - if (arg & G_CULL_BACK) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_CULL_BACK"); - } - } - if (arg & G_FOG) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_FOG"); - } - if (arg & G_LIGHTING) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_LIGHTING"); - } - if (arg & G_TEXTURE_GEN) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_TEXTURE_GEN"); - } - if (arg & G_TEXTURE_GEN_LINEAR) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_TEXTURE_GEN_LINEAR"); - } - if (arg & G_LOD) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_LOD"); - } - if (arg & G_SHADING_SMOOTH) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_SHADING_SMOOTH"); - } - if (arg & G_CLIPPING) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("G_CLIPPING"); - } - arg = arg & ~(G_ZBUFFER | G_TEXTURE_ENABLE | G_SHADE | G_CULL_BOTH | - G_FOG | G_LIGHTING | G_TEXTURE_GEN | - G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH | - G_CLIPPING); - if (arg) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_printf("0x%08" PRIX32, arg); - } - return n; -} - -UCFUNC int argfn_sftlo(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_MDSFT_ALPHACOMPARE: - return gfxd_puts("G_MDSFT_ALPHACOMPARE"); - case G_MDSFT_ZSRCSEL: - return gfxd_puts("G_MDSFT_ZSRCSEL"); - case G_MDSFT_RENDERMODE: - return gfxd_puts("G_MDSFT_RENDERMODE"); - case G_MDSFT_BLENDER: - return gfxd_puts("G_MDSFT_BLENDER"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int rm_mode_str(uint32_t arg) -{ - int n = 0; - if (arg & AA_EN) - n += gfxd_puts("AA_EN"); - if (arg & Z_CMP) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("Z_CMP"); - } - if (arg & Z_UPD) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("Z_UPD"); - } - if (arg & IM_RD) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("IM_RD"); - } - if (arg & CLR_ON_CVG) - { - if (n > 0) - n += gfxd_puts(" | "); - n += gfxd_puts("CLR_ON_CVG"); - } - if (n > 0) - n += gfxd_puts(" | "); - int cvg = arg & 0x00000300; - switch (cvg) - { - case CVG_DST_CLAMP: - n += gfxd_puts("CVG_DST_CLAMP"); - break; - case CVG_DST_WRAP: - n += gfxd_puts("CVG_DST_WRAP"); - break; - case CVG_DST_FULL: - n += gfxd_puts("CVG_DST_FULL"); - break; - case CVG_DST_SAVE: - n += gfxd_puts("CVG_DST_SAVE"); - break; - } - int zmode = arg & 0x00000C00; - switch (zmode) - { - case ZMODE_OPA: - n += gfxd_puts(" | ZMODE_OPA"); - break; - case ZMODE_INTER: - n += gfxd_puts(" | ZMODE_INTER"); - break; - case ZMODE_XLU: - n += gfxd_puts(" | ZMODE_XLU"); - break; - case ZMODE_DEC: - n += gfxd_puts(" | ZMODE_DEC"); - break; - } - if (arg & CVG_X_ALPHA) - n += gfxd_puts(" | CVG_X_ALPHA"); - if (arg & ALPHA_CVG_SEL) - n += gfxd_puts(" | ALPHA_CVG_SEL"); - if (arg & FORCE_BL) - n += gfxd_puts(" | FORCE_BL"); - return n; -} - -UCFUNC int rm_cbl_str(uint32_t arg, int c) -{ - int n = 0; - if (c == 2) - arg <<= 2; - int bp = (arg >> 30) & 0b11; - switch (bp) - { - case G_BL_CLR_IN: - n += gfxd_printf("GBL_c%i(G_BL_CLR_IN", c); - break; - case G_BL_CLR_MEM: - n += gfxd_printf("GBL_c%i(G_BL_CLR_MEM", c); - break; - case G_BL_CLR_BL: - n += gfxd_printf("GBL_c%i(G_BL_CLR_BL", c); - break; - case G_BL_CLR_FOG: - n += gfxd_printf("GBL_c%i(G_BL_CLR_FOG", c); - break; - } - int ba = (arg >> 26) & 0b11; - switch (ba) - { - case G_BL_A_IN: - n += gfxd_puts(", G_BL_A_IN"); - break; - case G_BL_A_FOG: - n += gfxd_puts(", G_BL_A_FOG"); - break; - case G_BL_A_SHADE: - n += gfxd_puts(", G_BL_A_SHADE"); - break; - case G_BL_0: - n += gfxd_puts(", G_BL_0"); - break; - } - int bm = (arg >> 22) & 0b11; - switch (bm) - { - case G_BL_CLR_IN: - n += gfxd_puts(", G_BL_CLR_IN"); - break; - case G_BL_CLR_MEM: - n += gfxd_puts(", G_BL_CLR_MEM"); - break; - case G_BL_CLR_BL: - n += gfxd_puts(", G_BL_CLR_BL"); - break; - case G_BL_CLR_FOG: - n += gfxd_puts(", G_BL_CLR_FOG"); - break; - } - int bb = (arg >> 18) & 0b11; - switch (bb) - { - case G_BL_1MA: - n += gfxd_puts(", G_BL_1MA)"); - break; - case G_BL_A_MEM: - n += gfxd_puts(", G_BL_A_MEM)"); - break; - case G_BL_1: - n += gfxd_puts(", G_BL_1)"); - break; - case G_BL_0: - n += gfxd_puts(", G_BL_0)"); - break; - } - return n; -} - -struct rm_preset -{ - uint32_t rm; - const char * name; -}; - -static const struct rm_preset rm_presets[] = -{ - {G_RM_OPA_SURF, "G_RM_OPA_SURF"}, - {G_RM_OPA_SURF2, "G_RM_OPA_SURF2"}, - {G_RM_AA_OPA_SURF, "G_RM_AA_OPA_SURF"}, - {G_RM_AA_OPA_SURF2, "G_RM_AA_OPA_SURF2"}, - {G_RM_RA_OPA_SURF, "G_RM_RA_OPA_SURF"}, - {G_RM_RA_OPA_SURF2, "G_RM_RA_OPA_SURF2"}, - {G_RM_ZB_OPA_SURF, "G_RM_ZB_OPA_SURF"}, - {G_RM_ZB_OPA_SURF2, "G_RM_ZB_OPA_SURF2"}, - {G_RM_AA_ZB_OPA_SURF, "G_RM_AA_ZB_OPA_SURF"}, - {G_RM_AA_ZB_OPA_SURF2, "G_RM_AA_ZB_OPA_SURF2"}, - {G_RM_RA_ZB_OPA_SURF, "G_RM_RA_ZB_OPA_SURF"}, - {G_RM_RA_ZB_OPA_SURF2, "G_RM_RA_ZB_OPA_SURF2"}, - {G_RM_XLU_SURF, "G_RM_XLU_SURF"}, - {G_RM_XLU_SURF2, "G_RM_XLU_SURF2"}, - {G_RM_AA_XLU_SURF, "G_RM_AA_XLU_SURF"}, - {G_RM_AA_XLU_SURF2, "G_RM_AA_XLU_SURF2"}, - {G_RM_ZB_XLU_SURF, "G_RM_ZB_XLU_SURF"}, - {G_RM_ZB_XLU_SURF2, "G_RM_ZB_XLU_SURF2"}, - {G_RM_AA_ZB_XLU_SURF, "G_RM_AA_ZB_XLU_SURF"}, - {G_RM_AA_ZB_XLU_SURF2, "G_RM_AA_ZB_XLU_SURF2"}, - {G_RM_ZB_OPA_DECAL, "G_RM_ZB_OPA_DECAL"}, - {G_RM_ZB_OPA_DECAL2, "G_RM_ZB_OPA_DECAL2"}, - {G_RM_AA_ZB_OPA_DECAL, "G_RM_AA_ZB_OPA_DECAL"}, - {G_RM_AA_ZB_OPA_DECAL2, "G_RM_AA_ZB_OPA_DECAL2"}, - {G_RM_RA_ZB_OPA_DECAL, "G_RM_RA_ZB_OPA_DECAL"}, - {G_RM_RA_ZB_OPA_DECAL2, "G_RM_RA_ZB_OPA_DECAL2"}, - {G_RM_ZB_XLU_DECAL, "G_RM_ZB_XLU_DECAL"}, - {G_RM_ZB_XLU_DECAL2, "G_RM_ZB_XLU_DECAL2"}, - {G_RM_AA_ZB_XLU_DECAL, "G_RM_AA_ZB_XLU_DECAL"}, - {G_RM_AA_ZB_XLU_DECAL2, "G_RM_AA_ZB_XLU_DECAL2"}, - {G_RM_AA_ZB_OPA_INTER, "G_RM_AA_ZB_OPA_INTER"}, - {G_RM_AA_ZB_OPA_INTER2, "G_RM_AA_ZB_OPA_INTER2"}, - {G_RM_RA_ZB_OPA_INTER, "G_RM_RA_ZB_OPA_INTER"}, - {G_RM_RA_ZB_OPA_INTER2, "G_RM_RA_ZB_OPA_INTER2"}, - {G_RM_AA_ZB_XLU_INTER, "G_RM_AA_ZB_XLU_INTER"}, - {G_RM_AA_ZB_XLU_INTER2, "G_RM_AA_ZB_XLU_INTER2"}, - {G_RM_AA_XLU_LINE, "G_RM_AA_XLU_LINE"}, - {G_RM_AA_XLU_LINE2, "G_RM_AA_XLU_LINE2"}, - {G_RM_AA_ZB_XLU_LINE, "G_RM_AA_ZB_XLU_LINE"}, - {G_RM_AA_ZB_XLU_LINE2, "G_RM_AA_ZB_XLU_LINE2"}, - {G_RM_AA_DEC_LINE, "G_RM_AA_DEC_LINE"}, - {G_RM_AA_DEC_LINE2, "G_RM_AA_DEC_LINE2"}, - {G_RM_AA_ZB_DEC_LINE, "G_RM_AA_ZB_DEC_LINE"}, - {G_RM_AA_ZB_DEC_LINE2, "G_RM_AA_ZB_DEC_LINE2"}, - {G_RM_TEX_EDGE, "G_RM_TEX_EDGE"}, - {G_RM_TEX_EDGE2, "G_RM_TEX_EDGE2"}, - {G_RM_AA_TEX_EDGE, "G_RM_AA_TEX_EDGE"}, - {G_RM_AA_TEX_EDGE2, "G_RM_AA_TEX_EDGE2"}, - {G_RM_AA_ZB_TEX_EDGE, "G_RM_AA_ZB_TEX_EDGE"}, - {G_RM_AA_ZB_TEX_EDGE2, "G_RM_AA_ZB_TEX_EDGE2"}, - {G_RM_AA_ZB_TEX_INTER, "G_RM_AA_ZB_TEX_INTER"}, - {G_RM_AA_ZB_TEX_INTER2, "G_RM_AA_ZB_TEX_INTER2"}, - {G_RM_AA_SUB_SURF, "G_RM_AA_SUB_SURF"}, - {G_RM_AA_SUB_SURF2, "G_RM_AA_SUB_SURF2"}, - {G_RM_AA_ZB_SUB_SURF, "G_RM_AA_ZB_SUB_SURF"}, - {G_RM_AA_ZB_SUB_SURF2, "G_RM_AA_ZB_SUB_SURF2"}, - {G_RM_PCL_SURF, "G_RM_PCL_SURF"}, - {G_RM_PCL_SURF2, "G_RM_PCL_SURF2"}, - {G_RM_AA_PCL_SURF, "G_RM_AA_PCL_SURF"}, - {G_RM_AA_PCL_SURF2, "G_RM_AA_PCL_SURF2"}, - {G_RM_ZB_PCL_SURF, "G_RM_ZB_PCL_SURF"}, - {G_RM_ZB_PCL_SURF2, "G_RM_ZB_PCL_SURF2"}, - {G_RM_AA_ZB_PCL_SURF, "G_RM_AA_ZB_PCL_SURF"}, - {G_RM_AA_ZB_PCL_SURF2, "G_RM_AA_ZB_PCL_SURF2"}, - {G_RM_AA_OPA_TERR, "G_RM_AA_OPA_TERR"}, - {G_RM_AA_OPA_TERR2, "G_RM_AA_OPA_TERR2"}, - {G_RM_AA_ZB_OPA_TERR, "G_RM_AA_ZB_OPA_TERR"}, - {G_RM_AA_ZB_OPA_TERR2, "G_RM_AA_ZB_OPA_TERR2"}, - {G_RM_AA_TEX_TERR, "G_RM_AA_TEX_TERR"}, - {G_RM_AA_TEX_TERR2, "G_RM_AA_TEX_TERR2"}, - {G_RM_AA_ZB_TEX_TERR, "G_RM_AA_ZB_TEX_TERR"}, - {G_RM_AA_ZB_TEX_TERR2, "G_RM_AA_ZB_TEX_TERR2"}, - {G_RM_AA_SUB_TERR, "G_RM_AA_SUB_TERR"}, - {G_RM_AA_SUB_TERR2, "G_RM_AA_SUB_TERR2"}, - {G_RM_AA_ZB_SUB_TERR, "G_RM_AA_ZB_SUB_TERR"}, - {G_RM_AA_ZB_SUB_TERR2, "G_RM_AA_ZB_SUB_TERR2"}, - {G_RM_CLD_SURF, "G_RM_CLD_SURF"}, - {G_RM_CLD_SURF2, "G_RM_CLD_SURF2"}, - {G_RM_ZB_CLD_SURF, "G_RM_ZB_CLD_SURF"}, - {G_RM_ZB_CLD_SURF2, "G_RM_ZB_CLD_SURF2"}, - {G_RM_ZB_OVL_SURF, "G_RM_ZB_OVL_SURF"}, - {G_RM_ZB_OVL_SURF2, "G_RM_ZB_OVL_SURF2"}, - {G_RM_ADD, "G_RM_ADD"}, - {G_RM_ADD2, "G_RM_ADD2"}, - {G_RM_VISCVG, "G_RM_VISCVG"}, - {G_RM_VISCVG2, "G_RM_VISCVG2"}, - {G_RM_OPA_CI, "G_RM_OPA_CI"}, - {G_RM_OPA_CI2, "G_RM_OPA_CI2"}, - {G_RM_RA_SPRITE, "G_RM_RA_SPRITE"}, - {G_RM_RA_SPRITE2, "G_RM_RA_SPRITE2"}, -}; - -static const struct rm_preset bl1_presets[] = -{ - {G_RM_FOG_SHADE_A, "G_RM_FOG_SHADE_A"}, - {G_RM_FOG_PRIM_A, "G_RM_FOG_PRIM_A"}, - {G_RM_PASS, "G_RM_PASS"}, - {G_RM_NOOP, "G_RM_NOOP"}, -}; - -static const struct rm_preset bl2_presets[] = -{ - {G_RM_NOOP2, "G_RM_NOOP2"}, -}; - -UCFUNC int othermodelo_str(uint32_t arg, uint32_t which) -{ - int n = 0; - uint32_t rm_c1_mask = MDMASK_RM_C1; - uint32_t rm_c2_mask = MDMASK_RM_C2; - uint32_t rm_mode_lo = MDMASK_RM_LO; - uint32_t rm_mask = rm_c1_mask | rm_c2_mask | rm_mode_lo; - const struct rm_preset *pre_c1 = NULL; - const struct rm_preset *pre_c2 = NULL; - int n_rm_presets = sizeof(rm_presets) / sizeof(*rm_presets); - for (int i = 0; i < n_rm_presets; i++) - { - const struct rm_preset *pre = &rm_presets[i]; - uint32_t pre_extra = pre->rm & ~rm_mask; - uint32_t rm_c1 = arg & (rm_c1_mask | rm_mode_lo | pre_extra); - if (!pre_c1 && rm_c1 == pre->rm) - pre_c1 = pre; - uint32_t rm_c2 = arg & (rm_c2_mask | rm_mode_lo | pre_extra); - if (!pre_c2 && rm_c2 == pre->rm) - pre_c2 = pre; - } - if (!pre_c1 || !pre_c2 || pre_c1 + 1 != pre_c2) - { - int n_bl1_presets = sizeof(bl1_presets) / sizeof(*bl1_presets); - for (int i = 0; i < n_bl1_presets; i++) - { - const struct rm_preset *pre = &bl1_presets[i]; - uint32_t pre_extra = pre->rm & ~rm_mask; - uint32_t rm_c1 = arg & (rm_c1_mask | pre_extra); - if (rm_c1 == pre->rm) - { - pre_c1 = pre; - break; - } - } - int n_bl2_presets = sizeof(bl2_presets) / sizeof(*bl2_presets); - for (int i = 0; i < n_bl2_presets; i++) - { - const struct rm_preset *pre = &bl2_presets[i]; - uint32_t pre_extra = pre->rm & ~rm_mask; - uint32_t rm_c2 = arg & (rm_c2_mask | pre_extra); - if (rm_c2 == pre->rm) - { - pre_c2 = pre; - break; - } - } - } - uint32_t pre_rm = 0; - if (pre_c1) - pre_rm |= pre_c1->rm; - if (pre_c2) - pre_rm |= pre_c2->rm; - uint32_t ac_mask = MDMASK(ALPHACOMPARE); - if (((arg & ~pre_rm) | which) & ac_mask) - { - uint32_t ac = arg & ac_mask; - switch (ac) - { - case G_AC_NONE: - n += gfxd_puts("G_AC_NONE"); - break; - case G_AC_THRESHOLD: - n += gfxd_puts("G_AC_THRESHOLD"); - break; - case G_AC_DITHER: - n += gfxd_puts("G_AC_DITHER"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, ac); - break; - } - } - uint32_t zs_mask = MDMASK(ZSRCSEL); - if (((arg & ~pre_rm) | which) & zs_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t zs = arg & zs_mask; - switch (zs) - { - case G_ZS_PIXEL: - n += gfxd_puts("G_ZS_PIXEL"); - break; - case G_ZS_PRIM: - n += gfxd_puts("G_ZS_PRIM"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, zs); - break; - } - } - uint32_t rm = arg & (rm_mask | pre_rm); - if (((arg & ~pre_rm) | which) & rm_mode_lo) - { - if (n > 0) - n += gfxd_puts(" | "); - n += rm_mode_str(rm); - } - int c = 0; - if (which & rm_c1_mask) - c |= 1; - if (which & rm_c2_mask) - c |= 2; - if (c & 1 || (c == 0 && arg & rm_c1_mask)) - { - if (n > 0) - n += gfxd_puts(" | "); - if (pre_c1) - n += gfxd_printf("%s", pre_c1->name); - else - n += rm_cbl_str(rm, 1); - } - if (c & 2 || (c == 0 && arg & rm_c2_mask)) - { - if (n > 0) - n += gfxd_puts(" | "); - if (pre_c2) - n += gfxd_printf("%s", pre_c2->name); - else - n += rm_cbl_str(rm, 2); - } - uint32_t unk_mask = ~(rm_mask | ac_mask | zs_mask); - if (arg & unk_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t unk = arg & unk_mask; - n += gfxd_printf("0x%08" PRIX32, unk); - } - return n; -} - -UCFUNC int argfn_ac(const gfxd_value_t *v) -{ - return othermodelo_str(v->u, MDMASK(ALPHACOMPARE)); -} - -UCFUNC int argfn_zs(const gfxd_value_t *v) -{ - return othermodelo_str(v->u, MDMASK(ZSRCSEL)); -} - -UCFUNC int argfn_rm1(const gfxd_value_t *v) -{ - return othermodelo_str(v->u, MDMASK_RM_C1); -} - -UCFUNC int argfn_rm2(const gfxd_value_t *v) -{ - return othermodelo_str(v->u, MDMASK_RM_C2); -} - -UCFUNC int argfn_othermodelo(const gfxd_value_t *v) -{ - uint32_t mask = MDMASK(ALPHACOMPARE) | MDMASK(ZSRCSEL) | MDMASK_RM_C1 | - MDMASK_RM_C2; - return othermodelo_str(v->u, mask); -} - -UCFUNC int argfn_sfthi(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_MDSFT_ALPHADITHER: - return gfxd_puts("G_MDSFT_ALPHADITHER"); - case G_MDSFT_RGBDITHER: - return gfxd_puts("G_MDSFT_RGBDITHER"); - case G_MDSFT_COMBKEY: - return gfxd_puts("G_MDSFT_COMBKEY"); - case G_MDSFT_TEXTCONV: - return gfxd_puts("G_MDSFT_TEXTCONV"); - case G_MDSFT_TEXTFILT: - return gfxd_puts("G_MDSFT_TEXTFILT"); - case G_MDSFT_TEXTLUT: - return gfxd_puts("G_MDSFT_TEXTLUT"); - case G_MDSFT_TEXTLOD: - return gfxd_puts("G_MDSFT_TEXTLOD"); - case G_MDSFT_TEXTDETAIL: - return gfxd_puts("G_MDSFT_TEXTDETAIL"); - case G_MDSFT_TEXTPERSP: - return gfxd_puts("G_MDSFT_TEXTPERSP"); - case G_MDSFT_CYCLETYPE: - return gfxd_puts("G_MDSFT_CYCLETYPE"); - case G_MDSFT_PIPELINE: - return gfxd_puts("G_MDSFT_PIPELINE"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int othermodehi_str(uint32_t arg, uint32_t which) -{ - int n = 0; - uint32_t ad_mask = MDMASK(ALPHADITHER); - if ((arg | which) & ad_mask) - { - uint32_t ad = arg & ad_mask; - switch (ad) - { - case G_AD_PATTERN: - n += gfxd_puts("G_AD_PATTERN"); - break; - case G_AD_NOTPATTERN: - n += gfxd_puts("G_AD_NOTPATTERN"); - break; - case G_AD_NOISE: - n += gfxd_puts("G_AD_NOISE"); - break; - case G_AD_DISABLE: - n += gfxd_puts("G_AD_DISABLE"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, ad); - break; - } - } - uint32_t cd_mask = MDMASK(RGBDITHER); - if ((arg | which) & cd_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t cd = arg & cd_mask; - switch (cd) - { - case G_CD_MAGICSQ: - n += gfxd_puts("G_CD_MAGICSQ"); - break; - case G_CD_BAYER: - n += gfxd_puts("G_CD_BAYER"); - break; - case G_CD_NOISE: - n += gfxd_puts("G_CD_NOISE"); - break; - case G_CD_DISABLE: - n += gfxd_puts("G_CD_DISABLE"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, cd); - break; - } - } - uint32_t ck_mask = MDMASK(COMBKEY); - if ((arg | which) & ck_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t ck = arg & ck_mask; - switch (ck) - { - case G_CK_NONE: - n += gfxd_puts("G_CK_NONE"); - break; - case G_CK_KEY: - n += gfxd_puts("G_CK_KEY"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, ck); - break; - } - } - uint32_t tc_mask = MDMASK(TEXTCONV); - if ((arg | which) & tc_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t tc = arg & tc_mask; - switch (tc) - { - case G_TC_CONV: - n += gfxd_puts("G_TC_CONV"); - break; - case G_TC_FILTCONV: - n += gfxd_puts("G_TC_FILTCONV"); - break; - case G_TC_FILT: - n += gfxd_puts("G_TC_FILT"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, tc); - break; - } - } - uint32_t tf_mask = MDMASK(TEXTFILT); - if ((arg | which) & tf_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t tf = arg & tf_mask; - switch (tf) - { - case G_TF_POINT: - n += gfxd_puts("G_TF_POINT"); - break; - case G_TF_BILERP: - n += gfxd_puts("G_TF_BILERP"); - break; - case G_TF_AVERAGE: - n += gfxd_puts("G_TF_AVERAGE"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, tf); - break; - } - } - uint32_t tt_mask = MDMASK(TEXTLUT); - if ((arg | which) & tt_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t tt = arg & tt_mask; - switch (tt) - { - case G_TT_NONE: - n += gfxd_puts("G_TT_NONE"); - break; - case G_TT_RGBA16: - n += gfxd_puts("G_TT_RGBA16"); - break; - case G_TT_IA16: - n += gfxd_puts("G_TT_IA16"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, tt); - break; - } - } - uint32_t tl_mask = MDMASK(TEXTLOD); - if ((arg | which) & tl_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t tl = arg & tl_mask; - switch (tl) - { - case G_TL_TILE: - n += gfxd_puts("G_TL_TILE"); - break; - case G_TL_LOD: - n += gfxd_puts("G_TL_LOD"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, tl); - break; - } - } - uint32_t td_mask = MDMASK(TEXTDETAIL); - if ((arg | which) & td_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t td = arg & td_mask; - switch (td) - { - case G_TD_CLAMP: - n += gfxd_puts("G_TD_CLAMP"); - break; - case G_TD_SHARPEN: - n += gfxd_puts("G_TD_SHARPEN"); - break; - case G_TD_DETAIL: - n += gfxd_puts("G_TD_DETAIL"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, td); - break; - } - } - uint32_t tp_mask = MDMASK(TEXTPERSP); - if ((arg | which) & tp_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t tp = arg & tp_mask; - switch (tp) - { - case G_TP_NONE: - n += gfxd_puts("G_TP_NONE"); - break; - case G_TP_PERSP: - n += gfxd_puts("G_TP_PERSP"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, tp); - break; - } - } - uint32_t cyc_mask = MDMASK(CYCLETYPE); - if ((arg | which) & cyc_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t cyc = arg & cyc_mask; - switch (cyc) - { - case G_CYC_1CYCLE: - n += gfxd_puts("G_CYC_1CYCLE"); - break; - case G_CYC_2CYCLE: - n += gfxd_puts("G_CYC_2CYCLE"); - break; - case G_CYC_COPY: - n += gfxd_puts("G_CYC_COPY"); - break; - case G_CYC_FILL: - n += gfxd_puts("G_CYC_FILL"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, cyc); - break; - } - } - uint32_t pm_mask = MDMASK(PIPELINE); - if ((arg | which) & pm_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t pm = arg & pm_mask; - switch (pm) - { - case G_PM_NPRIMITIVE: - n += gfxd_puts("G_PM_NPRIMITIVE"); - break; - case G_PM_1PRIMITIVE: - n += gfxd_puts("G_PM_1PRIMITIVE"); - break; - default: - n += gfxd_printf("0x%08" PRIX32, pm); - break; - } - } - uint32_t unk_mask = ~(ad_mask | cd_mask | ck_mask | tc_mask | tf_mask | - tt_mask | tl_mask | td_mask | tp_mask | - cyc_mask | pm_mask); - if (arg & unk_mask) - { - if (n > 0) - n += gfxd_puts(" | "); - uint32_t unk = arg & unk_mask; - n += gfxd_printf("0x%08" PRIX32, unk); - } - return n; -} - -UCFUNC int argfn_ad(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(ALPHADITHER)); -} - -UCFUNC int argfn_cd(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(RGBDITHER)); -} - -UCFUNC int argfn_ck(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(COMBKEY)); -} - -UCFUNC int argfn_tc(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTCONV)); -} - -UCFUNC int argfn_tf(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTFILT)); -} - -UCFUNC int argfn_tt(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTLUT)); -} - -UCFUNC int argfn_tl(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTLOD)); -} - -UCFUNC int argfn_td(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTDETAIL)); -} - -UCFUNC int argfn_tp(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(TEXTPERSP)); -} - -UCFUNC int argfn_cyc(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(CYCLETYPE)); -} - -UCFUNC int argfn_pm(const gfxd_value_t *v) -{ - return othermodehi_str(v->u, MDMASK(PIPELINE)); -} - -UCFUNC int argfn_othermodehi(const gfxd_value_t *v) -{ - uint32_t mask = MDMASK(ALPHADITHER) | - MDMASK(RGBDITHER) | - MDMASK(COMBKEY) | - MDMASK(TEXTCONV) | - MDMASK(TEXTFILT) | - MDMASK(TEXTLUT) | - MDMASK(TEXTLOD) | - MDMASK(TEXTDETAIL) | - MDMASK(TEXTPERSP) | - MDMASK(CYCLETYPE) | - MDMASK(PIPELINE); - return othermodehi_str(v->u, mask); -} - -UCFUNC int argfn_cv(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_CV_K0: - return gfxd_puts("G_CV_K0"); - case G_CV_K1: - return gfxd_puts("G_CV_K1"); - case G_CV_K2: - return gfxd_puts("G_CV_K2"); - case G_CV_K3: - return gfxd_puts("G_CV_K3"); - case G_CV_K4: - return gfxd_puts("G_CV_K4"); - case G_CV_K5: - return gfxd_puts("G_CV_K5"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_ccmuxa(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_CCMUX_COMBINED: - return gfxd_puts("COMBINED"); - case G_CCMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_CCMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_CCMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_CCMUX_SHADE: - return gfxd_puts("SHADE"); - case G_CCMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_CCMUX_1: - return gfxd_puts("1"); - case G_CCMUX_NOISE: - return gfxd_puts("NOISE"); - default: - return gfxd_puts("0"); - } -} - -UCFUNC int argfn_ccmuxb(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_CCMUX_COMBINED: - return gfxd_puts("COMBINED"); - case G_CCMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_CCMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_CCMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_CCMUX_SHADE: - return gfxd_puts("SHADE"); - case G_CCMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_CCMUX_CENTER: - return gfxd_puts("CENTER"); - case G_CCMUX_K4: - return gfxd_puts("K4"); - default: - return gfxd_puts("0"); - } -} - -UCFUNC int argfn_ccmuxc(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_CCMUX_COMBINED: - return gfxd_puts("COMBINED"); - case G_CCMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_CCMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_CCMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_CCMUX_SHADE: - return gfxd_puts("SHADE"); - case G_CCMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_CCMUX_SCALE: - return gfxd_puts("SCALE"); - case G_CCMUX_COMBINED_ALPHA: - return gfxd_puts("COMBINED_ALPHA"); - case G_CCMUX_TEXEL0_ALPHA: - return gfxd_puts("TEXEL0_ALPHA"); - case G_CCMUX_TEXEL1_ALPHA: - return gfxd_puts("TEXEL1_ALPHA"); - case G_CCMUX_PRIMITIVE_ALPHA: - return gfxd_puts("PRIMITIVE_ALPHA"); - case G_CCMUX_SHADE_ALPHA: - return gfxd_puts("SHADE_ALPHA"); - case G_CCMUX_ENV_ALPHA: - return gfxd_puts("ENV_ALPHA"); - case G_CCMUX_LOD_FRACTION: - return gfxd_puts("LOD_FRACTION"); - case G_CCMUX_PRIM_LOD_FRAC: - return gfxd_puts("PRIM_LOD_FRAC"); - case G_CCMUX_K5: - return gfxd_puts("K5"); - default: - return gfxd_puts("0"); - } -} - -UCFUNC int argfn_ccmuxd(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_CCMUX_COMBINED: - return gfxd_puts("COMBINED"); - case G_CCMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_CCMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_CCMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_CCMUX_SHADE: - return gfxd_puts("SHADE"); - case G_CCMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_CCMUX_1: - return gfxd_puts("1"); - default: - return gfxd_puts("0"); - } -} - -UCFUNC int argfn_acmuxabd(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_ACMUX_COMBINED: - return gfxd_puts("COMBINED"); - case G_ACMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_ACMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_ACMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_ACMUX_SHADE: - return gfxd_puts("SHADE"); - case G_ACMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_ACMUX_1: - return gfxd_puts("1"); - default: - return gfxd_puts("0"); - } -} - -UCFUNC int argfn_acmuxc(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_ACMUX_LOD_FRACTION: - return gfxd_puts("LOD_FRACTION"); - case G_ACMUX_TEXEL0: - return gfxd_puts("TEXEL0"); - case G_ACMUX_TEXEL1: - return gfxd_puts("TEXEL1"); - case G_ACMUX_PRIMITIVE: - return gfxd_puts("PRIMITIVE"); - case G_ACMUX_SHADE: - return gfxd_puts("SHADE"); - case G_ACMUX_ENVIRONMENT: - return gfxd_puts("ENVIRONMENT"); - case G_ACMUX_PRIM_LOD_FRAC: - return gfxd_puts("PRIM_LOD_FRAC"); - default: - return gfxd_puts("0"); - } -} - -struct cc_mode -{ - int a; - int b; - int c; - int d; - int Aa; - int Ab; - int Ac; - int Ad; -}; - -struct cc_preset -{ - struct cc_mode mode; - const char * name; -}; - -#define CC_(a,b,c,d,Aa,Ab,Ac,Ad) \ - { \ - G_CCMUX_##a, G_CCMUX_##b, \ - G_CCMUX_##c, G_CCMUX_##d, \ - G_ACMUX_##Aa, G_ACMUX_##Ab, \ - G_ACMUX_##Ac, G_ACMUX_##Ad \ - } -#define CC(m) CC_(m) -static const struct cc_preset cc_presets[] = -{ - {CC(G_CC_MODULATEI), "G_CC_MODULATEI"}, - {CC(G_CC_MODULATEIA), "G_CC_MODULATEIA"}, - {CC(G_CC_MODULATEIDECALA), "G_CC_MODULATEIDECALA"}, - {CC(G_CC_MODULATERGB), "G_CC_MODULATERGB"}, - {CC(G_CC_MODULATERGBA), "G_CC_MODULATERGBA"}, - {CC(G_CC_MODULATERGBDECALA), "G_CC_MODULATERGBDECALA"}, - {CC(G_CC_MODULATEI_PRIM), "G_CC_MODULATEI_PRIM"}, - {CC(G_CC_MODULATEIA_PRIM), "G_CC_MODULATEIA_PRIM"}, - {CC(G_CC_MODULATEIDECALA_PRIM), "G_CC_MODULATEIDECALA_PRIM"}, - {CC(G_CC_MODULATERGB_PRIM), "G_CC_MODULATERGB_PRIM"}, - {CC(G_CC_MODULATERGBA_PRIM), "G_CC_MODULATERGBA_PRIM"}, - {CC(G_CC_MODULATERGBDECALA_PRIM), "G_CC_MODULATERGBDECALA_PRIM"}, - {CC(G_CC_DECALRGB), "G_CC_DECALRGB"}, - {CC(G_CC_DECALRGBA), "G_CC_DECALRGBA"}, - {CC(G_CC_BLENDI), "G_CC_BLENDI"}, - {CC(G_CC_BLENDIA), "G_CC_BLENDIA"}, - {CC(G_CC_BLENDIDECALA), "G_CC_BLENDIDECALA"}, - {CC(G_CC_BLENDRGBA), "G_CC_BLENDRGBA"}, - {CC(G_CC_BLENDRGBDECALA), "G_CC_BLENDRGBDECALA"}, - {CC(G_CC_REFLECTRGB), "G_CC_REFLECTRGB"}, - {CC(G_CC_REFLECTRGBDECALA), "G_CC_REFLECTRGBDECALA"}, - {CC(G_CC_HILITERGB), "G_CC_HILITERGB"}, - {CC(G_CC_HILITERGBA), "G_CC_HILITERGBA"}, - {CC(G_CC_HILITERGBDECALA), "G_CC_HILITERGBDECALA"}, - {CC(G_CC_1CYUV2RGB), "G_CC_1CYUV2RGB"}, - {CC(G_CC_PRIMITIVE), "G_CC_PRIMITIVE"}, - {CC(G_CC_SHADE), "G_CC_SHADE"}, - {CC(G_CC_ADDRGB), "G_CC_ADDRGB"}, - {CC(G_CC_ADDRGBDECALA), "G_CC_ADDRGBDECALA"}, - {CC(G_CC_SHADEDECALA), "G_CC_SHADEDECALA"}, - {CC(G_CC_BLENDPE), "G_CC_BLENDPE"}, - {CC(G_CC_BLENDPEDECALA), "G_CC_BLENDPEDECALA"}, - {CC(G_CC_TRILERP), "G_CC_TRILERP"}, - {CC(G_CC_TEMPLERP), "G_CC_TEMPLERP"}, - {CC(G_CC_INTERFERENCE), "G_CC_INTERFERENCE"}, - {CC(_G_CC_BLENDPE), "_G_CC_BLENDPE"}, - {CC(_G_CC_BLENDPEDECALA), "_G_CC_BLENDPEDECALA"}, - {CC(_G_CC_SPARSEST), "_G_CC_SPARSEST"}, - {CC(_G_CC_TWOCOLORTEX), "_G_CC_TWOCOLORTEX"}, - {CC(G_CC_MODULATEI2), "G_CC_MODULATEI2"}, - {CC(G_CC_MODULATEIA2), "G_CC_MODULATEIA2"}, - {CC(G_CC_MODULATERGB2), "G_CC_MODULATERGB2"}, - {CC(G_CC_MODULATERGBA2), "G_CC_MODULATERGBA2"}, - {CC(G_CC_MODULATEI_PRIM2), "G_CC_MODULATEI_PRIM2"}, - {CC(G_CC_MODULATEIA_PRIM2), "G_CC_MODULATEIA_PRIM2"}, - {CC(G_CC_MODULATERGB_PRIM2), "G_CC_MODULATERGB_PRIM2"}, - {CC(G_CC_MODULATERGBA_PRIM2), "G_CC_MODULATERGBA_PRIM2"}, - {CC(G_CC_DECALRGB2), "G_CC_DECALRGB2"}, - {CC(G_CC_BLENDI2), "G_CC_BLENDI2"}, - {CC(G_CC_BLENDIA2), "G_CC_BLENDIA2"}, - {CC(G_CC_HILITERGB2), "G_CC_HILITERGB2"}, - {CC(G_CC_HILITERGBA2), "G_CC_HILITERGBA2"}, - {CC(G_CC_HILITERGBDECALA2), "G_CC_HILITERGBDECALA2"}, - {CC(G_CC_HILITERGBPASSA2), "G_CC_HILITERGBPASSA2"}, - {CC(G_CC_CHROMA_KEY2), "G_CC_CHROMA_KEY2"}, - {CC(G_CC_YUV2RGB), "G_CC_YUV2RGB"}, - {CC(G_CC_PASS2), "G_CC_PASS2"}, -}; -#undef CC_ -#undef CC - -UCFUNC int argfn_ccpre(const gfxd_value_t *v) -{ - return gfxd_printf("%s", cc_presets[v->i].name); -} - -UCFUNC int argfn_sc(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_SC_NON_INTERLACE: - return gfxd_puts("G_SC_NON_INTERLACE"); - case G_SC_EVEN_INTERLACE: - return gfxd_puts("G_SC_EVEN_INTERLACE"); - case G_SC_ODD_INTERLACE: - return gfxd_puts("G_SC_ODD_INTERLACE"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int argfn_bz(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_BZ_PERSP: - return gfxd_puts("G_BZ_PERSP"); - default: - return gfxd_puts("G_BZ_ORTHO"); - } -} -#endif - -UCFUNC int argfn_dlf(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_DL_PUSH: - return gfxd_puts("G_DL_PUSH"); - case G_DL_NOPUSH: - return gfxd_puts("G_DL_NOPUSH"); - default: - return gfxd_printf("%" PRIi32, v->i);; - } -} - -UCFUNC int argfn_mp(const gfxd_value_t *v) -{ - int n = 0; - if (v->u & G_MTX_PUSH) - n += gfxd_puts("G_MTX_PUSH"); - else - n += gfxd_puts("G_MTX_NOPUSH"); - if (v->u & G_MTX_LOAD) - n += gfxd_puts(" | G_MTX_LOAD"); - else - n += gfxd_puts(" | G_MTX_MUL"); - if (v->u & G_MTX_PROJECTION) - n += gfxd_puts(" | G_MTX_PROJECTION"); - else - n += gfxd_puts(" | G_MTX_MODELVIEW"); - for (int i = 3; i < 8; i++) - if (v->u & (1 << i)) - n += gfxd_printf(" | 0x%02x", 1 << i); - return n; -} - -UCFUNC int argfn_ms(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_MTX_MODELVIEW: - return gfxd_puts("G_MTX_MODELVIEW"); - case G_MTX_PROJECTION: - return gfxd_puts("G_MTX_PROJECTION"); - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_mw(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_MW_MATRIX: - return gfxd_puts("G_MW_MATRIX"); - case G_MW_NUMLIGHT: - return gfxd_puts("G_MW_NUMLIGHT"); - case G_MW_CLIP: - return gfxd_puts("G_MW_CLIP"); - case G_MW_SEGMENT: - return gfxd_puts("G_MW_SEGMENT"); - case G_MW_FOG: - return gfxd_puts("G_MW_FOG"); - case G_MW_LIGHTCOL: - return gfxd_puts("G_MW_LIGHTCOL"); - case G_MW_PERSPNORM: - return gfxd_puts("G_MW_PERSPNORM"); -#if defined(F3D_GBI) || defined(F3DEX_GBI) - case G_MW_POINTS: - return gfxd_puts("G_MW_POINTS"); -#endif -#if defined(F3DEX_GBI_2) - case G_MW_FORCEMTX: - return gfxd_puts("G_MW_FORCEMTX"); -#endif - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_mwo_clip(const gfxd_value_t *v) -{ - switch (v->u) - { - case G_MWO_CLIP_RNX: - return gfxd_puts("G_MWO_CLIP_RNX"); - case G_MWO_CLIP_RNY: - return gfxd_puts("G_MWO_CLIP_RNY"); - case G_MWO_CLIP_RPX: - return gfxd_puts("G_MWO_CLIP_RPX"); - case G_MWO_CLIP_RPY: - return gfxd_puts("G_MWO_CLIP_RPY"); - default: - return gfxd_printf("0x%04" PRIX32, v->u); - } -} - -UCFUNC int argfn_mwo_lightcol(const gfxd_value_t *v) -{ - switch (v->u) - { - case G_MWO_aLIGHT_1: - return gfxd_puts("G_MWO_aLIGHT_1"); - case G_MWO_bLIGHT_1: - return gfxd_puts("G_MWO_bLIGHT_1"); - case G_MWO_aLIGHT_2: - return gfxd_puts("G_MWO_aLIGHT_2"); - case G_MWO_bLIGHT_2: - return gfxd_puts("G_MWO_bLIGHT_2"); - case G_MWO_aLIGHT_3: - return gfxd_puts("G_MWO_aLIGHT_3"); - case G_MWO_bLIGHT_3: - return gfxd_puts("G_MWO_bLIGHT_3"); - case G_MWO_aLIGHT_4: - return gfxd_puts("G_MWO_aLIGHT_4"); - case G_MWO_bLIGHT_4: - return gfxd_puts("G_MWO_bLIGHT_4"); - case G_MWO_aLIGHT_5: - return gfxd_puts("G_MWO_aLIGHT_5"); - case G_MWO_bLIGHT_5: - return gfxd_puts("G_MWO_bLIGHT_5"); - case G_MWO_aLIGHT_6: - return gfxd_puts("G_MWO_aLIGHT_6"); - case G_MWO_bLIGHT_6: - return gfxd_puts("G_MWO_bLIGHT_6"); - case G_MWO_aLIGHT_7: - return gfxd_puts("G_MWO_aLIGHT_7"); - case G_MWO_bLIGHT_7: - return gfxd_puts("G_MWO_bLIGHT_7"); - case G_MWO_aLIGHT_8: - return gfxd_puts("G_MWO_aLIGHT_8"); - case G_MWO_bLIGHT_8: - return gfxd_puts("G_MWO_bLIGHT_8"); - default: - return gfxd_printf("0x%04" PRIX32, v->u); - } -} - -UCFUNC int argfn_lightnum(const gfxd_value_t *v) -{ - return gfxd_printf("LIGHT_%" PRIi32, v->i); -} - -UCFUNC int argfn_lightsn(const gfxd_value_t *v) -{ - return gfxd_printf("*(Lightsn *)0x%08" PRIX32, v->u); -} - -UCFUNC int argfn_mwo_matrix(const gfxd_value_t *v) -{ - switch (v->u) - { - case G_MWO_MATRIX_XX_XY_I: - return gfxd_puts("G_MWO_MATRIX_XX_XY_I"); - case G_MWO_MATRIX_XZ_XW_I: - return gfxd_puts("G_MWO_MATRIX_XZ_XW_I"); - case G_MWO_MATRIX_YX_YY_I: - return gfxd_puts("G_MWO_MATRIX_YX_YY_I"); - case G_MWO_MATRIX_YZ_YW_I: - return gfxd_puts("G_MWO_MATRIX_YZ_YW_I"); - case G_MWO_MATRIX_ZX_ZY_I: - return gfxd_puts("G_MWO_MATRIX_ZX_ZY_I"); - case G_MWO_MATRIX_ZZ_ZW_I: - return gfxd_puts("G_MWO_MATRIX_ZZ_ZW_I"); - case G_MWO_MATRIX_WX_WY_I: - return gfxd_puts("G_MWO_MATRIX_WX_WY_I"); - case G_MWO_MATRIX_WZ_WW_I: - return gfxd_puts("G_MWO_MATRIX_WZ_WW_I"); - case G_MWO_MATRIX_XX_XY_F: - return gfxd_puts("G_MWO_MATRIX_XX_XY_F"); - case G_MWO_MATRIX_XZ_XW_F: - return gfxd_puts("G_MWO_MATRIX_XZ_XW_F"); - case G_MWO_MATRIX_YX_YY_F: - return gfxd_puts("G_MWO_MATRIX_YX_YY_F"); - case G_MWO_MATRIX_YZ_YW_F: - return gfxd_puts("G_MWO_MATRIX_YZ_YW_F"); - case G_MWO_MATRIX_ZX_ZY_F: - return gfxd_puts("G_MWO_MATRIX_ZX_ZY_F"); - case G_MWO_MATRIX_ZZ_ZW_F: - return gfxd_puts("G_MWO_MATRIX_ZZ_ZW_F"); - case G_MWO_MATRIX_WX_WY_F: - return gfxd_puts("G_MWO_MATRIX_WX_WY_F"); - case G_MWO_MATRIX_WZ_WW_F: - return gfxd_puts("G_MWO_MATRIX_WZ_WW_F"); - default: - return gfxd_printf("0x%04" PRIX32, v->u); - } -} - -UCFUNC int argfn_mwo_point(const gfxd_value_t *v) -{ - switch (v->u) - { - case G_MWO_POINT_RGBA: - return gfxd_puts("G_MWO_POINT_RGBA"); - case G_MWO_POINT_ST: - return gfxd_puts("G_MWO_POINT_ST"); - case G_MWO_POINT_XYSCREEN: - return gfxd_puts("G_MWO_POINT_XYSCREEN"); - case G_MWO_POINT_ZSCREEN: - return gfxd_puts("G_MWO_POINT_ZSCREEN"); - default: - return gfxd_printf("0x%04" PRIX32, v->u); - } -} - -UCFUNC int argfn_mv(const gfxd_value_t *v) -{ - switch (v->i) - { - case G_MV_VIEWPORT: - return gfxd_puts("G_MV_VIEWPORT"); -#if defined(F3D_GBI) || defined(F3DEX_GBI) - case G_MV_LOOKATY: - return gfxd_puts("G_MV_LOOKATY"); - case G_MV_LOOKATX: - return gfxd_puts("G_MV_LOOKATX"); - case G_MV_L0: - return gfxd_puts("G_MV_L0"); - case G_MV_L1: - return gfxd_puts("G_MV_L1"); - case G_MV_L2: - return gfxd_puts("G_MV_L2"); - case G_MV_L3: - return gfxd_puts("G_MV_L3"); - case G_MV_L4: - return gfxd_puts("G_MV_L4"); - case G_MV_L5: - return gfxd_puts("G_MV_L5"); - case G_MV_L6: - return gfxd_puts("G_MV_L6"); - case G_MV_L7: - return gfxd_puts("G_MV_L7"); - case G_MV_TXTATT: - return gfxd_puts("G_MV_TXTATT"); - case G_MV_MATRIX_2: - return gfxd_puts("G_MV_MATRIX_2"); - case G_MV_MATRIX_3: - return gfxd_puts("G_MV_MATRIX_3"); - case G_MV_MATRIX_4: - return gfxd_puts("G_MV_MATRIX_4"); - case G_MV_MATRIX_1: - return gfxd_puts("G_MV_MATRIX_1"); -#elif defined(F3DEX_GBI_2) - case G_MV_MMTX: - return gfxd_puts("G_MV_MMTX"); - case G_MV_PMTX: - return gfxd_puts("G_MV_PMTX"); - case G_MV_LIGHT: - return gfxd_puts("G_MV_LIGHT"); - case G_MV_POINT: - return gfxd_puts("G_MV_POINT"); - case G_MV_MATRIX: - return gfxd_puts("G_MV_MATRIX"); -#endif - default: - return gfxd_printf("%" PRIi32, v->i); - } -} - -UCFUNC int argfn_cr(const gfxd_value_t *v) -{ - switch (v->u) - { - case FRUSTRATIO_1: - return gfxd_puts("FRUSTRATIO_1"); - case FRUSTRATIO_2: - return gfxd_puts("FRUSTRATIO_2"); - case FRUSTRATIO_3: - return gfxd_puts("FRUSTRATIO_3"); - case FRUSTRATIO_4: - return gfxd_puts("FRUSTRATIO_4"); - case FRUSTRATIO_5: - return gfxd_puts("FRUSTRATIO_5"); - case FRUSTRATIO_6: - return gfxd_puts("FRUSTRATIO_6"); - default: - return gfxd_printf("%" PRIu32, v->u); - } -} diff --git a/ZAPDTR/lib/libgfxd/uc_argtbl.c b/ZAPDTR/lib/libgfxd/uc_argtbl.c deleted file mode 100644 index 22a0b6500..000000000 --- a/ZAPDTR/lib/libgfxd/uc_argtbl.c +++ /dev/null @@ -1,485 +0,0 @@ -static const gfxd_arg_type_t arg_tbl[] = -{ - [gfxd_Word] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Opcode] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_opc, - }, - [gfxd_Coordi] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_u, - }, - [gfxd_Coordq] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_qu102, - }, - [gfxd_Pal] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Tlut] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Timg] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Tmem] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x16, - }, - [gfxd_Tile] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_tile, - }, - [gfxd_Fmt] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_fmt, - }, - [gfxd_Siz] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_siz, - }, - [gfxd_Dim] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Cm] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_cm, - }, - [gfxd_Tm] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_tm, - }, - [gfxd_Ts] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ts, - }, - [gfxd_Dxt] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_u, - }, - [gfxd_Tag] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Pm] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_pm, - }, - [gfxd_Colorpart] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_color, - }, - [gfxd_Color] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Lodfrac] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_qu08, - }, - [gfxd_Cimg] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Zimg] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Ac] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_ac, - }, - [gfxd_Ad] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_ad, - }, - [gfxd_Cd] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_cd, - }, - [gfxd_Ccpre] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_ccpre, - }, - [gfxd_Ccmuxa] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ccmuxa, - }, - [gfxd_Ccmuxb] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ccmuxb, - }, - [gfxd_Ccmuxc] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ccmuxc, - }, - [gfxd_Ccmuxd] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ccmuxd, - }, - [gfxd_Acmuxabd] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_acmuxabd, - }, - [gfxd_Acmuxc] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_acmuxc, - }, - [gfxd_Cv] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_cv, - }, - [gfxd_Tc] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_tc, - }, - [gfxd_Cyc] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_cyc, - }, - [gfxd_Zs] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_zs, - }, - [gfxd_Ck] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_ck, - }, - [gfxd_Keyscale] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_color, - }, - [gfxd_Keywidth] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_qs48, - }, - [gfxd_Zi] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Rm1] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_rm1, - }, - [gfxd_Rm2] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_rm2, - }, - [gfxd_Sc] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_sc, - }, - [gfxd_Td] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_td, - }, - [gfxd_Tf] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_tf, - }, - [gfxd_Tl] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_tl, - }, - [gfxd_Tt] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_tt, - }, - [gfxd_Tp] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_tp, - }, - [gfxd_Line] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Vtx] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Vtxflag] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Dl] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_Zraw] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_qs1616, - }, -#endif - [gfxd_Dlflag] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_dlf, - }, - [gfxd_Cr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_cr, - }, - [gfxd_Num] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Fogz] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Fogp] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Mtxptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Gm] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_gm, - }, - [gfxd_Mwo_matrix] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_mwo_matrix, - }, - [gfxd_Linewd] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Uctext] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Ucdata] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Size] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x16, - }, - [gfxd_Lookatptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Mtxparam] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_mp, - }, - [gfxd_Mtxstack] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_ms, - }, - [gfxd_Mwo_point] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_mwo_point, - }, - [gfxd_Wscale] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_qu016, - }, - [gfxd_Seg] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x8, - }, - [gfxd_Segptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Lightsn] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_lightsn, - }, - [gfxd_Numlights] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, - [gfxd_Lightnum] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_lightnum, - }, - [gfxd_Lightptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Tcscale] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_qu016, - }, - [gfxd_Switch] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_switch, - }, - [gfxd_St] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_qs105, - }, - [gfxd_Stdelta] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_qs510, - }, - [gfxd_Vtxptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Vpptr] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Dram] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x32, - }, - [gfxd_Sftlo] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_sftlo, - }, - [gfxd_Othermodelo] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_othermodelo, - }, - [gfxd_Sfthi] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_sfthi, - }, - [gfxd_Othermodehi] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_othermodehi, - }, - [gfxd_Mw] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_mw, - }, - [gfxd_Mwo] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x16, - }, - [gfxd_Mwo_clip] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_mwo_clip, - }, - [gfxd_Mwo_lightcol] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_mwo_lightcol, - }, - [gfxd_Mv] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_mv, - }, - [gfxd_Mvo] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x16, - }, - [gfxd_Dmem] = - { - .fmt = gfxd_argfmt_u, - .fn = argfn_x16, - }, - [gfxd_Dmaflag] = - { - .fmt = gfxd_argfmt_i, - .fn = argfn_i, - }, -}; diff --git a/ZAPDTR/lib/libgfxd/uc_f3d.c b/ZAPDTR/lib/libgfxd/uc_f3d.c deleted file mode 100644 index 946551510..000000000 --- a/ZAPDTR/lib/libgfxd/uc_f3d.c +++ /dev/null @@ -1,4 +0,0 @@ -#define uc_name gfxd_f3d -#define F3D_GBI - -#include "uc.c" diff --git a/ZAPDTR/lib/libgfxd/uc_f3db.c b/ZAPDTR/lib/libgfxd/uc_f3db.c deleted file mode 100644 index cd4990412..000000000 --- a/ZAPDTR/lib/libgfxd/uc_f3db.c +++ /dev/null @@ -1,5 +0,0 @@ -#define uc_name gfxd_f3db -#define F3D_GBI -#define F3D_BETA - -#include "uc.c" diff --git a/ZAPDTR/lib/libgfxd/uc_f3dex.c b/ZAPDTR/lib/libgfxd/uc_f3dex.c deleted file mode 100644 index 2ec70d8ab..000000000 --- a/ZAPDTR/lib/libgfxd/uc_f3dex.c +++ /dev/null @@ -1,4 +0,0 @@ -#define uc_name gfxd_f3dex -#define F3DEX_GBI - -#include "uc.c" diff --git a/ZAPDTR/lib/libgfxd/uc_f3dex2.c b/ZAPDTR/lib/libgfxd/uc_f3dex2.c deleted file mode 100644 index 9a19c9903..000000000 --- a/ZAPDTR/lib/libgfxd/uc_f3dex2.c +++ /dev/null @@ -1,4 +0,0 @@ -#define uc_name gfxd_f3dex2 -#define F3DEX_GBI_2 - -#include "uc.c" diff --git a/ZAPDTR/lib/libgfxd/uc_f3dexb.c b/ZAPDTR/lib/libgfxd/uc_f3dexb.c deleted file mode 100644 index 2b5c30a4a..000000000 --- a/ZAPDTR/lib/libgfxd/uc_f3dexb.c +++ /dev/null @@ -1,5 +0,0 @@ -#define uc_name gfxd_f3dexb -#define F3DEX_GBI -#define F3D_BETA - -#include "uc.c" diff --git a/ZAPDTR/lib/libgfxd/uc_macrofn.c b/ZAPDTR/lib/libgfxd/uc_macrofn.c deleted file mode 100644 index 46d4b4ee8..000000000 --- a/ZAPDTR/lib/libgfxd/uc_macrofn.c +++ /dev/null @@ -1,2507 +0,0 @@ -static inline uint32_t getfield(uint32_t w, int n, int s) -{ - return (w >> s) & (((uint32_t)1 << n) - 1); -} - -static inline int32_t argvi(gfxd_macro_t *m, int idx) -{ - return m->arg[idx].value.i; -} - -static inline uint32_t argvu(gfxd_macro_t *m, int idx) -{ - return m->arg[idx].value.u; -} - -static inline float argvf(gfxd_macro_t *m, int idx) -{ - return m->arg[idx].value.f; -} - -static inline void argi(gfxd_macro_t *m, int idx, const char *name, - int32_t value, int type) -{ - m->arg[idx].type = type; - m->arg[idx].name = name; - m->arg[idx].value.i = value; - m->arg[idx].bad = 0; -} - -static inline void argu(gfxd_macro_t *m, int idx, const char *name, - uint32_t value, int type) -{ - m->arg[idx].type = type; - m->arg[idx].name = name; - m->arg[idx].value.u = value; - m->arg[idx].bad = 0; -} - -static inline void argf(gfxd_macro_t *m, int idx, const char *name, - float value, int type) -{ - m->arg[idx].type = type; - m->arg[idx].name = name; - m->arg[idx].value.f = value; - m->arg[idx].bad = 0; -} - -static inline void badarg(gfxd_macro_t *m, int idx) -{ - m->arg[idx].bad = 1; -} - -UCFUNC int32_t sx(uint32_t n, int bits) -{ - int32_t smin = (int32_t)1 << (bits - 1); - int32_t smax = (int32_t)1 << bits; - int32_t i = n; - if (i < smin) - return i; - else - return i - smax; -} - -UCFUNC int d_Invalid(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_Invalid; - argu(m, 0, "hi", hi, gfxd_Word); - argu(m, 1, "lo", lo, gfxd_Word); - return -1; -} - -UCFUNC int d_DPFillRectangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPFillRectangle; - argu(m, 0, "ulx", getfield(lo, 10, 14), gfxd_Coordi); - argu(m, 1, "uly", getfield(lo, 10, 2), gfxd_Coordi); - argu(m, 2, "lrx", getfield(hi, 10, 14), gfxd_Coordi); - argu(m, 3, "lry", getfield(hi, 10, 2), gfxd_Coordi); - return 0; -} - -UCFUNC int d_DPFullSync(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPFullSync; - return 0; -} - -UCFUNC int d_DPLoadSync(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPLoadSync; - return 0; -} - -UCFUNC int d_DPTileSync(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPTileSync; - return 0; -} - -UCFUNC int d_DPPipeSync(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPPipeSync; - return 0; -} - -UCFUNC int c_DPLoadTLUT_pal16(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 6) - return -1; - if (m[0].id != gfxd_DPSetTextureImage - || argvi(&m[0], 0) != G_IM_FMT_RGBA - || argvi(&m[0], 1) != G_IM_SIZ_16b - || argvi(&m[0], 2) != 1) - { - return -1; - } - uint32_t dram = argvu(&m[0], 3); - if (m[1].id != gfxd_DPTileSync) - return -1; - if (m[2].id != gfxd_DPSetTile - || argvi(&m[2], 0) != 0 - || argvi(&m[2], 1) != 0 - || argvi(&m[2], 2) != 0 - || argvu(&m[2], 3) < 0x100 - || argvu(&m[2], 3) % 0x10 != 0 - || argvi(&m[2], 4) != G_TX_LOADTILE - || argvi(&m[2], 5) != 0 - || argvu(&m[2], 6) != 0 - || argvi(&m[2], 7) != 0 - || argvi(&m[2], 8) != 0 - || argvu(&m[2], 9) != 0 - || argvi(&m[2], 10) != 0 - || argvi(&m[2], 11) != 0) - { - return -1; - } - int pal = (argvu(&m[2], 3) - 0x100) / 0x10; - if (m[3].id != gfxd_DPLoadSync) - return -1; - if (m[4].id != gfxd_DPLoadTLUTCmd - || argvi(&m[4], 0) != G_TX_LOADTILE - || argvi(&m[4], 1) != 15) - { - return -1; - } - if (m[5].id != gfxd_DPPipeSync) - return -1; - m->id = gfxd_DPLoadTLUT_pal16; - argi(m, 0, "pal", pal, gfxd_Pal); - argu(m, 1, "dram", dram, gfxd_Tlut); - return 0; -} - -UCFUNC int c_DPLoadTLUT_pal256(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 6) - return -1; - if (m[0].id != gfxd_DPSetTextureImage - || argvi(&m[0], 0) != G_IM_FMT_RGBA - || argvi(&m[0], 1) != G_IM_SIZ_16b - || argvi(&m[0], 2) != 1) - { - return -1; - } - uint32_t dram = argvu(&m[0], 3); - if (m[1].id != gfxd_DPTileSync) - return -1; - if (m[2].id != gfxd_DPSetTile - || argvi(&m[2], 0) != 0 - || argvi(&m[2], 1) != 0 - || argvi(&m[2], 2) != 0 - || argvu(&m[2], 3) != 0x100 - || argvi(&m[2], 4) != G_TX_LOADTILE - || argvi(&m[2], 5) != 0 - || argvu(&m[2], 6) != 0 - || argvi(&m[2], 7) != 0 - || argvi(&m[2], 8) != 0 - || argvu(&m[2], 9) != 0 - || argvi(&m[2], 10) != 0 - || argvi(&m[2], 11) != 0) - { - return -1; - } - if (m[3].id != gfxd_DPLoadSync) - return -1; - if (m[4].id != gfxd_DPLoadTLUTCmd - || argvi(&m[4], 0) != G_TX_LOADTILE - || argvi(&m[4], 1) != 255) - { - return -1; - } - if (m[5].id != gfxd_DPPipeSync) - return -1; - m->id = gfxd_DPLoadTLUT_pal256; - argu(m, 0, "dram", dram, gfxd_Tlut); - return 0; -} - -UCFUNC int c_ltb(gfxd_macro_t *m, int n_macro, int id, int mdxt, int mtmem, - int mrt, int myuv, int m4b) -{ - if (n_macro < 7) - return -1; - if (m[0].id != gfxd_DPSetTextureImage || argvi(&m[0], 2) != 1) - return -1; - g_ifmt_t fmt = argvi(&m[0], 0); - g_isiz_t ldsiz = argvi(&m[0], 1); - uint32_t timg = argvu(&m[0], 3); - if (myuv && fmt != G_IM_FMT_YUV) - return -1; - if (m[1].id != gfxd_DPSetTile - || argvi(&m[1], 0) != fmt - || argvi(&m[1], 1) != ldsiz - || argvi(&m[1], 2) != 0 - || argvi(&m[1], 4) != G_TX_LOADTILE - || argvi(&m[1], 5) != 0) - { - return -1; - } - uint32_t tmem = argvu(&m[1], 3); - unsigned cms = argvu(&m[1], 9); - unsigned cmt = argvu(&m[1], 6); - int masks = argvi(&m[1], 10); - int maskt = argvi(&m[1], 7); - int shifts = argvi(&m[1], 11); - int shiftt = argvi(&m[1], 8); - if (m[2].id != gfxd_DPLoadSync) - return -1; - if (m[3].id != gfxd_DPLoadBlock - || argvi(&m[3], 0) != G_TX_LOADTILE - || argvu(&m[3], 1) != 0 - || argvu(&m[3], 2) != 0) - { - return -1; - } - qu102_t ldlrs = argvu(&m[3], 3); - unsigned lddxt = argvu(&m[3], 4); - if (m[4].id != gfxd_DPPipeSync) - return -1; - if (m[5].id != gfxd_DPSetTile - || argvi(&m[5], 0) != fmt - || G_SIZ_LDSIZ(argvi(&m[5], 1)) != ldsiz - || argvu(&m[5], 3) != tmem - || argvu(&m[5], 6) != cmt - || argvi(&m[5], 7) != maskt - || argvi(&m[5], 8) != shiftt - || argvu(&m[5], 9) != cms - || argvi(&m[5], 10) != masks - || argvi(&m[5], 11) != shifts) - { - return -1; - } - int siz = argvi(&m[5], 1); - int rdline = argvi(&m[5], 2); - int rt = argvi(&m[5], 4); - int pal = argvi(&m[5], 5); - if (m4b && siz != G_IM_SIZ_4b) - return -1; - if (!(mrt && rt != G_TX_RENDERTILE && tmem == 0) - && (tmem != 0) != mtmem) - { - return -1; - } - if ((rt != G_TX_RENDERTILE) != mrt) - return -1; - if (m[6].id != gfxd_DPSetTileSize - || argvi(&m[6], 0) != rt - || argvu(&m[6], 1) != 0 - || argvu(&m[6], 2) != 0 - || (argvu(&m[6], 3) & 3) - || (argvu(&m[6], 4) & 3)) - { - return -1; - } - int width = (argvu(&m[6], 3) >> 2) + 1; - int height = (argvu(&m[6], 4) >> 2) + 1; - unsigned lrs = G_LDBLK_TXL(G_LTB_LRS(width, height, siz)); - unsigned dxt = 0; - if (!mdxt) - dxt = G_DXT(siz, width); - int line; - if (myuv) - line = (width + 7) / 8; - else - line = (width * G_SIZ_LDBITS(siz) + 63) / 64; - if (ldlrs != lrs || lddxt != dxt || rdline != line) - return -1; - m->id = id; - int i = 0; - argu(m, i++, "timg", timg, gfxd_Timg); - if (mtmem) - argu(m, i++, "tmem", tmem, gfxd_Tmem); - if (mrt) - argi(m, i++, "rtile", rt, gfxd_Tile); - argi(m, i++, "fmt", fmt, gfxd_Fmt); - if (!m4b) - argi(m, i++, "siz", siz, gfxd_Siz); - argi(m, i++, "width", width, gfxd_Dim); - argi(m, i++, "height", height, gfxd_Dim); - argi(m, i++, "pal", pal, gfxd_Pal); - argu(m, i++, "cms", cms, gfxd_Cm); - argu(m, i++, "cmt", cmt, gfxd_Cm); - argi(m, i++, "masks", masks, gfxd_Tm); - argi(m, i++, "maskt", maskt, gfxd_Tm); - argi(m, i++, "shifts", shifts, gfxd_Ts); - argi(m, i++, "shiftt", shiftt, gfxd_Ts); - return 0; -} - -UCFUNC int c_DPLoadMultiBlockYuvS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlockYuvS, 1, 1, 1, 1, 0); -} - -UCFUNC int c_DPLoadMultiBlockYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlockYuv, 0, 1, 1, 1, 0); -} - -UCFUNC int c_DPLoadMultiBlock_4bS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlock_4bS, 1, 1, 1, 0, 1); -} - -UCFUNC int c_DPLoadMultiBlock_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlock_4b, 0, 1, 1, 0, 1); -} - -UCFUNC int c_DPLoadMultiBlockS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlockS, 1, 1, 1, 0, 0); -} - -UCFUNC int c_DPLoadMultiBlock(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadMultiBlock, 0, 1, 1, 0, 0); -} - -UCFUNC int c__DPLoadTextureBlockYuvS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlockYuvS, 1, 1, 0, 1, 0); -} - -UCFUNC int c__DPLoadTextureBlockYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlockYuv, 0, 1, 0, 1, 0); -} - -UCFUNC int c__DPLoadTextureBlock_4bS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlock_4bS, 1, 1, 0, 0, 1); -} - -UCFUNC int c__DPLoadTextureBlock_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlock_4b, 0, 1, 0, 0, 1); -} - -UCFUNC int c__DPLoadTextureBlockS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlockS, 1, 1, 0, 0, 0); -} - -UCFUNC int c__DPLoadTextureBlock(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd__DPLoadTextureBlock, 0, 1, 0, 0, 0); -} - -UCFUNC int c_DPLoadTextureBlockYuvS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlockYuvS, 1, 0, 0, 1, 0); -} - -UCFUNC int c_DPLoadTextureBlockYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlockYuv, 0, 0, 0, 1, 0); -} - -UCFUNC int c_DPLoadTextureBlock_4bS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlock_4bS, 1, 0, 0, 0, 1); -} - -UCFUNC int c_DPLoadTextureBlock_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlock_4b, 0, 0, 0, 0, 1); -} - -UCFUNC int c_DPLoadTextureBlockS(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlockS, 1, 0, 0, 0, 0); -} - -UCFUNC int c_DPLoadTextureBlock(gfxd_macro_t *m, int n_macro) -{ - return c_ltb(m, n_macro, gfxd_DPLoadTextureBlock, 0, 0, 0, 0, 0); -} - -UCFUNC int c_ltt(gfxd_macro_t *m, int n_macro, int id, int mtmem, int mrt, - int myuv, int m4b) -{ - if (n_macro < 7) - return -1; - if (m[0].id != gfxd_DPSetTextureImage) - return -1; - g_ifmt_t fmt = argvi(&m[0], 0); - g_isiz_t ldsiz = argvi(&m[0], 1); - int width = argvi(&m[0], 2); - if (m4b) - { - if (ldsiz != G_IM_SIZ_8b) - return -1; - width *= 2; - } - uint32_t timg = argvu(&m[0], 3); - if (myuv && fmt != G_IM_FMT_YUV) - return -1; - if (m[1].id != gfxd_DPSetTile - || argvi(&m[1], 0) != fmt - || argvi(&m[1], 1) != ldsiz - || argvi(&m[1], 4) != G_TX_LOADTILE - || argvi(&m[1], 5) != 0) - { - return -1; - } - int ldline = argvi(&m[1], 2); - uint32_t tmem = argvu(&m[1], 3); - unsigned cms = argvu(&m[1], 9); - unsigned cmt = argvu(&m[1], 6); - int masks = argvi(&m[1], 10); - int maskt = argvi(&m[1], 7); - int shifts = argvi(&m[1], 11); - int shiftt = argvi(&m[1], 8); - if (m[2].id != gfxd_DPLoadSync) - return -1; - if (m[3].id != gfxd_DPLoadTile - || argvi(&m[3], 0) != G_TX_LOADTILE - || (argvu(&m[3], 1) & 1) - || (argvu(&m[3], 2) & 3) - || (argvu(&m[3], 3) & 1) - || (argvu(&m[3], 4) & 3)) - { - return -1; - } - qu102_t lduls = argvu(&m[3], 1); - qu102_t ldult = argvu(&m[3], 2); - qu102_t ldlrs = argvu(&m[3], 3); - qu102_t ldlrt = argvu(&m[3], 4); - if (m[4].id != gfxd_DPPipeSync) - return -1; - if (m[5].id != gfxd_DPSetTile - || argvi(&m[5], 0) != fmt - || argvi(&m[5], 2) != ldline - || argvu(&m[5], 3) != tmem - || argvu(&m[5], 6) != cmt - || argvi(&m[5], 7) != maskt - || argvi(&m[5], 8) != shiftt - || argvu(&m[5], 9) != cms - || argvi(&m[5], 10) != masks - || argvi(&m[5], 11) != shifts) - { - return -1; - } - int siz = argvi(&m[5], 1); - int rt = argvi(&m[5], 4); - int pal = argvi(&m[5], 5); - if (m4b) - { - if (siz != G_IM_SIZ_4b) - return -1; - } - else if (siz != ldsiz) - return -1; - if (!(mrt && rt != G_TX_RENDERTILE && tmem == 0) - && (tmem != 0) != mtmem) - { - return -1; - } - if ((rt != G_TX_RENDERTILE) != mrt) - return -1; - if (m[6].id != gfxd_DPSetTileSize - || argvi(&m[6], 0) != rt - || (argvu(&m[6], 1) & 3) - || (argvu(&m[6], 2) & 3) - || (argvu(&m[6], 3) & 3) - || (argvu(&m[6], 4) & 3)) - { - return -1; - } - unsigned uls = argvu(&m[6], 1) >> 2; - unsigned ult = argvu(&m[6], 2) >> 2; - unsigned lrs = argvu(&m[6], 3) >> 2; - unsigned lrt = argvu(&m[6], 4) >> 2; - int line; - if (myuv) - line = ((lrs - uls + 1) + 7) / 8; - else if (m4b) - line = ((lrs - uls + 1) / 2 + 7) / 8; - else - line = ((lrs - uls + 1) * G_SIZ_LDBITS(siz) + 63) / 64; - if (m4b) - { - if (lduls != qu102(uls) / 2 || ldlrs != qu102(lrs) / 2) - return -1; - } - else if (lduls != qu102(uls) || ldlrs != qu102(lrs)) - return -1; - if (ldult != qu102(ult) || ldlrt != qu102(lrt) || ldline != line) - return -1; - m->id = id; - int i = 0; - argu(m, i++, "timg", timg, gfxd_Timg); - if (mtmem) - argu(m, i++, "tmem", tmem, gfxd_Tmem); - if (mrt) - argi(m, i++, "rtile", rt, gfxd_Tile); - argi(m, i++, "fmt", fmt, gfxd_Fmt); - if (!m4b) - argi(m, i++, "siz", siz, gfxd_Siz); - argi(m, i++, "width", width, gfxd_Dim); - argi(m, i++, "height", 0, gfxd_Dim); - argu(m, i++, "uls", uls, gfxd_Coordi); - argu(m, i++, "ult", ult, gfxd_Coordi); - argu(m, i++, "lrs", lrs, gfxd_Coordi); - argu(m, i++, "lrt", lrt, gfxd_Coordi); - argi(m, i++, "pal", pal, gfxd_Pal); - argu(m, i++, "cms", cms, gfxd_Cm); - argu(m, i++, "cmt", cmt, gfxd_Cm); - argi(m, i++, "masks", masks, gfxd_Tm); - argi(m, i++, "maskt", maskt, gfxd_Tm); - argi(m, i++, "shifts", shifts, gfxd_Ts); - argi(m, i++, "shiftt", shiftt, gfxd_Ts); - return 0; -} - -UCFUNC int c_DPLoadMultiTileYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadMultiTileYuv, 1, 1, 1, 0); -} - -UCFUNC int c_DPLoadMultiTile_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadMultiTile_4b, 1, 1, 0, 1); -} - -UCFUNC int c_DPLoadMultiTile(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadMultiTile, 1, 1, 0, 0); -} - -UCFUNC int c__DPLoadTextureTileYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd__DPLoadTextureTileYuv, 1, 0, 1, 0); -} - -UCFUNC int c__DPLoadTextureTile_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd__DPLoadTextureTile_4b, 1, 0, 0, 1); -} - -UCFUNC int c__DPLoadTextureTile(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd__DPLoadTextureTile, 1, 0, 0, 0); -} - -UCFUNC int c_DPLoadTextureTileYuv(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadTextureTileYuv, 0, 0, 1, 0); -} - -UCFUNC int c_DPLoadTextureTile_4b(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadTextureTile_4b, 0, 0, 0, 1); -} - -UCFUNC int c_DPLoadTextureTile(gfxd_macro_t *m, int n_macro) -{ - return c_ltt(m, n_macro, gfxd_DPLoadTextureTile, 0, 0, 0, 0); -} - -UCFUNC int d_DPLoadBlock(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPLoadBlock; - argi(m, 0, "tile", getfield(lo, 3, 24), gfxd_Tile); - argu(m, 1, "uls", getfield(hi, 12, 12), gfxd_Coordi); - argu(m, 2, "ult", getfield(hi, 12, 0), gfxd_Coordi); - argu(m, 3, "lrs", getfield(lo, 12, 12), gfxd_Coordi); - argu(m, 4, "dxt", getfield(lo, 12, 0), gfxd_Dxt); - if (argvu(m, 3) > G_TX_LDBLK_MAX_TXL) { - badarg(m, 3); - return -1; - } - else { - return 0; - } -} - -UCFUNC int d_DPNoOp(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPNoOp; - return 0; -} - -UCFUNC int d_DPNoOpTag(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - if (lo == 0) - return d_DPNoOp(m, hi, lo); - else - { - m->id = gfxd_DPNoOpTag; - argu(m, 0, "tag", lo, gfxd_Tag); - return 0; - } -} - -UCFUNC int d_DPPipelineMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPPipelineMode; - argu(m, 0, "mode", lo, gfxd_Pm); - return 0; -} - -UCFUNC int d_DPSetBlendColor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetBlendColor; - argu(m, 0, "r", getfield(lo, 8, 24), gfxd_Colorpart); - argu(m, 1, "g", getfield(lo, 8, 16), gfxd_Colorpart); - argu(m, 2, "b", getfield(lo, 8, 8), gfxd_Colorpart); - argu(m, 3, "a", getfield(lo, 8, 0), gfxd_Colorpart); - return 0; -} - -UCFUNC int d_DPSetEnvColor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetEnvColor; - argu(m, 0, "r", getfield(lo, 8, 24), gfxd_Colorpart); - argu(m, 1, "g", getfield(lo, 8, 16), gfxd_Colorpart); - argu(m, 2, "b", getfield(lo, 8, 8), gfxd_Colorpart); - argu(m, 3, "a", getfield(lo, 8, 0), gfxd_Colorpart); - return 0; -} - -UCFUNC int d_DPSetFillColor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetFillColor; - argu(m, 0, "c", lo, gfxd_Color); - return 0; -} - -UCFUNC int d_DPSetFogColor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetFogColor; - argu(m, 0, "r", getfield(lo, 8, 24), gfxd_Colorpart); - argu(m, 1, "g", getfield(lo, 8, 16), gfxd_Colorpart); - argu(m, 2, "b", getfield(lo, 8, 8), gfxd_Colorpart); - argu(m, 3, "a", getfield(lo, 8, 0), gfxd_Colorpart); - return 0; -} - -UCFUNC int d_DPSetPrimColor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetPrimColor; - argu(m, 0, "m", getfield(hi, 8, 8), gfxd_Lodfrac); - argu(m, 1, "l", getfield(hi, 8, 0), gfxd_Lodfrac); - argu(m, 2, "r", getfield(lo, 8, 24), gfxd_Colorpart); - argu(m, 3, "g", getfield(lo, 8, 16), gfxd_Colorpart); - argu(m, 4, "b", getfield(lo, 8, 8), gfxd_Colorpart); - argu(m, 5, "a", getfield(lo, 8, 0), gfxd_Colorpart); - return 0; -} - -UCFUNC int d_DPSetColorImage(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetColorImage; - argi(m, 0, "fmt", getfield(hi, 3, 21), gfxd_Fmt); - argi(m, 1, "siz", getfield(hi, 2, 19), gfxd_Siz); - argi(m, 2, "width", getfield(hi, 12, 0) + 1, gfxd_Dim); - argu(m, 3, "cimg", lo, gfxd_Cimg); - return 0; -} - -UCFUNC int d_DPSetDepthImage(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetDepthImage; - argu(m, 0, "zimg", lo, gfxd_Zimg); - return 0; -} - -UCFUNC int d_DPSetTextureImage(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureImage; - argi(m, 0, "fmt", getfield(hi, 3, 21), gfxd_Fmt); - argi(m, 1, "siz", getfield(hi, 2, 19), gfxd_Siz); - argi(m, 2, "width", getfield(hi, 12, 0) + 1, gfxd_Dim); - argu(m, 3, "timg", lo, gfxd_Timg); - return 0; -} - -UCFUNC int d_DPSetAlphaCompare(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetAlphaCompare; - argu(m, 0, "mode", lo, gfxd_Ac); - return 0; -} - -UCFUNC int d_DPSetAlphaDither(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetAlphaDither; - argu(m, 0, "mode", lo, gfxd_Ad); - return 0; -} - -UCFUNC int d_DPSetColorDither(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetColorDither; - argu(m, 0, "mode", lo, gfxd_Cd); - return 0; -} - -UCFUNC void cc_unpack(struct cc_mode *m0, struct cc_mode *m1, uint32_t hi, - uint32_t lo) -{ - m0->a = getfield(hi, 4, 20); - m0->b = getfield(lo, 4, 28); - m0->c = getfield(hi, 5, 15); - m0->d = getfield(lo, 3, 15); - m0->Aa = getfield(hi, 3, 12); - m0->Ab = getfield(lo, 3, 12); - m0->Ac = getfield(hi, 3, 9); - m0->Ad = getfield(lo, 3, 9); - m1->a = getfield(hi, 4, 5); - m1->b = getfield(lo, 4, 24); - m1->c = getfield(hi, 5, 0); - m1->d = getfield(lo, 3, 6); - m1->Aa = getfield(lo, 3, 21); - m1->Ab = getfield(lo, 3, 3); - m1->Ac = getfield(lo, 3, 18); - m1->Ad = getfield(lo, 3, 0); -} - -UCFUNC int cc_lookup(const struct cc_mode *m) -{ - struct cc_mode m_norm = *m; - if (m_norm.a > 0x7) m_norm.a = G_CCMUX_0; - if (m_norm.b > 0x7) m_norm.b = G_CCMUX_0; - if (m_norm.c > 0xF) m_norm.c = G_CCMUX_0; - if (m_norm.d > 0x6) m_norm.d = G_CCMUX_0; - m = &m_norm; - int n_presets = sizeof(cc_presets) / sizeof(*cc_presets); - for (int i = 0; i < n_presets; i++) - { - const struct cc_mode *p = &cc_presets[i].mode; - if (m->a == p->a - && m->b == p->b - && m->c == p->c - && m->d == p->d - && m->Aa == p->Aa - && m->Ab == p->Ab - && m->Ac == p->Ac - && m->Ad == p->Ad) - { - return i; - } - } - return -1; -} - -UCFUNC int d_DPSetCombineMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetCombineMode; - struct cc_mode m0; - struct cc_mode m1; - cc_unpack(&m0, &m1, hi, lo); - int p0 = cc_lookup(&m0); - int p1 = cc_lookup(&m1); - argi(m, 0, "mode1", p0, gfxd_Ccpre); - argi(m, 1, "mode2", p1, gfxd_Ccpre); - int ret = 0; - if (p0 == -1) - { - badarg(m, 0); - ret = -1; - } - if (p1 == -1) - { - badarg(m, 1); - ret = -1; - } - return ret; -} - -UCFUNC int d_DPSetCombineLERP(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - struct cc_mode m0; - struct cc_mode m1; - cc_unpack(&m0, &m1, hi, lo); - int p0 = cc_lookup(&m0); - int p1 = cc_lookup(&m1); - if (p0 != -1 && p1 != -1) - return d_DPSetCombineMode(m, hi, lo); - else - { - m->id = gfxd_DPSetCombineLERP; - argi(m, 0, "a0", m0.a, gfxd_Ccmuxa); - argi(m, 1, "b0", m0.b, gfxd_Ccmuxb); - argi(m, 2, "c0", m0.c, gfxd_Ccmuxc); - argi(m, 3, "d0", m0.d, gfxd_Ccmuxd); - argi(m, 4, "Aa0", m0.Aa, gfxd_Acmuxabd); - argi(m, 5, "Ab0", m0.Ab, gfxd_Acmuxabd); - argi(m, 6, "Ac0", m0.Ac, gfxd_Acmuxc); - argi(m, 7, "Ad0", m0.Ad, gfxd_Acmuxabd); - argi(m, 8, "a1", m1.a, gfxd_Ccmuxa); - argi(m, 9, "b1", m1.b, gfxd_Ccmuxb); - argi(m, 10, "c1", m1.c, gfxd_Ccmuxc); - argi(m, 11, "d1", m1.d, gfxd_Ccmuxd); - argi(m, 12, "Aa1", m1.Aa, gfxd_Acmuxabd); - argi(m, 13, "Ab1", m1.Ab, gfxd_Acmuxabd); - argi(m, 14, "Ac1", m1.Ac, gfxd_Acmuxc); - argi(m, 15, "Ad1", m1.Ad, gfxd_Acmuxabd); - return 0; - } -} - -UCFUNC int d_DPSetConvert(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetConvert; - argi(m, 0, "k0", sx(getfield(hi, 9, 13), 9), gfxd_Cv); - argi(m, 1, "k1", sx(getfield(hi, 9, 4), 9), gfxd_Cv); - argi(m, 2, "k2", sx((getfield(hi, 4, 0) << 5) | getfield(lo, 5, 27), 9), - gfxd_Cv); - argi(m, 3, "k3", sx(getfield(lo, 9, 18), 9), gfxd_Cv); - argi(m, 4, "k4", sx(getfield(lo, 9, 9), 9), gfxd_Cv); - argi(m, 5, "k5", sx(getfield(lo, 9, 0), 9), gfxd_Cv); - return 0; -} - -UCFUNC int d_DPSetTextureConvert(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureConvert; - argu(m, 0, "mode", lo, gfxd_Tc); - return 0; -} - -UCFUNC int d_DPSetCycleType(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetCycleType; - argu(m, 0, "mode", lo, gfxd_Cyc); - return 0; -} - -UCFUNC int d_DPSetDepthSource(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetDepthSource; - argu(m, 0, "mode", lo, gfxd_Zs); - return 0; -} - -UCFUNC int d_DPSetCombineKey(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetCombineKey; - argu(m, 0, "mode", lo, gfxd_Ck); - return 0; -} - -UCFUNC int d_DPSetKeyGB(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetKeyGB; - argu(m, 0, "cG", getfield(lo, 8, 24), gfxd_Color); - argu(m, 1, "sG", getfield(lo, 8, 16), gfxd_Keyscale); - argi(m, 2, "wG", sx(getfield(hi, 12, 12), 12), gfxd_Keywidth); - argu(m, 3, "cB", getfield(lo, 8, 8), gfxd_Color); - argu(m, 4, "sB", getfield(lo, 8, 0), gfxd_Keyscale); - argi(m, 5, "wB", sx(getfield(hi, 12, 0), 12), gfxd_Keywidth); - return 0; -} - -UCFUNC int d_DPSetKeyR(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetKeyR; - argu(m, 0, "cR", getfield(lo, 8, 8), gfxd_Color); - argu(m, 1, "sR", getfield(lo, 8, 0), gfxd_Keyscale); - argi(m, 2, "wR", sx(getfield(lo, 12, 16), 12), gfxd_Keywidth); - return 0; -} - -UCFUNC int d_DPSetPrimDepth(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetPrimDepth; - argi(m, 0, "z", sx(getfield(lo, 16, 16), 16), gfxd_Zi); - argi(m, 1, "dz", sx(getfield(lo, 16, 0), 16), gfxd_Zi); - return 0; -} - -UCFUNC int d_DPSetRenderMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetRenderMode; - argu(m, 0, "mode1", lo, gfxd_Rm1); - argu(m, 1, "mode2", lo, gfxd_Rm2); - return 0; -} - -UCFUNC int d_DPSetScissor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetScissor; - argi(m, 0, "mode", getfield(lo, 2, 24), gfxd_Sc); - argu(m, 1, "ulx", getfield(hi, 10, 14), gfxd_Coordi); - argu(m, 2, "uly", getfield(hi, 10, 2), gfxd_Coordi); - argu(m, 3, "lrx", getfield(lo, 10, 14), gfxd_Coordi); - argu(m, 4, "lry", getfield(lo, 10, 2), gfxd_Coordi); - return 0; -} - -UCFUNC int d_DPSetScissorFrac(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - qu102_t ulx = getfield(hi, 12, 12); - qu102_t uly = getfield(hi, 12, 0); - qu102_t lrx = getfield(lo, 12, 12); - qu102_t lry = getfield(lo, 12, 0); - if ((ulx & 3) || (uly & 3) || (lrx & 3) || (lry & 3)) - { - m->id = gfxd_DPSetScissorFrac; - argi(m, 0, "mode", getfield(lo, 2, 24), gfxd_Sc); - argu(m, 1, "ulx", ulx, gfxd_Coordq); - argu(m, 2, "uly", uly, gfxd_Coordq); - argu(m, 3, "lrx", lrx, gfxd_Coordq); - argu(m, 4, "lry", lry, gfxd_Coordq); - return 0; - } - else - return d_DPSetScissor(m, hi, lo); -} - -UCFUNC int d_DPSetTextureDetail(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureDetail; - argu(m, 0, "mode", lo, gfxd_Td); - return 0; -} - -UCFUNC int d_DPSetTextureFilter(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureFilter; - argu(m, 0, "mode", lo, gfxd_Tf); - return 0; -} - -UCFUNC int d_DPSetTextureLOD(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureLOD; - argu(m, 0, "mode", lo, gfxd_Tl); - return 0; -} - -UCFUNC int d_DPSetTextureLUT(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTextureLUT; - argu(m, 0, "mode", lo, gfxd_Tt); - return 0; -} - -UCFUNC int d_DPSetTexturePersp(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTexturePersp; - argu(m, 0, "mode", lo, gfxd_Tp); - return 0; -} - -UCFUNC int d_DPSetTile(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTile; - argi(m, 0, "fmt", getfield(hi, 3, 21), gfxd_Fmt); - argi(m, 1, "siz", getfield(hi, 2, 19), gfxd_Siz); - argi(m, 2, "line", getfield(hi, 9, 9), gfxd_Line); - argu(m, 3, "tmem", getfield(hi, 9, 0), gfxd_Tmem); - argi(m, 4, "tile", getfield(lo, 3, 24), gfxd_Tile); - argi(m, 5, "pal", getfield(lo, 4, 20), gfxd_Pal); - argu(m, 6, "cmt", getfield(lo, 2, 18), gfxd_Cm); - argi(m, 7, "maskt", getfield(lo, 4, 14), gfxd_Tm); - argi(m, 8, "shiftt", getfield(lo, 4, 10), gfxd_Ts); - argu(m, 9, "cms", getfield(lo, 2, 8), gfxd_Cm); - argi(m, 10, "masks", getfield(lo, 4, 4), gfxd_Tm); - argi(m, 11, "shifts", getfield(lo, 4, 0), gfxd_Ts); - return 0; -} - -UCFUNC int d_DPSetTileSize(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetTileSize; - argi(m, 0, "tile", getfield(lo, 3, 24), gfxd_Tile); - argu(m, 1, "uls", getfield(hi, 12, 12), gfxd_Coordq); - argu(m, 2, "ult", getfield(hi, 12, 0), gfxd_Coordq); - argu(m, 3, "lrs", getfield(lo, 12, 12), gfxd_Coordq); - argu(m, 4, "lrt", getfield(lo, 12, 0), gfxd_Coordq); - return 0; -} - -#if defined(F3D_GBI) -UCFUNC int d_SP1Triangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SP1Triangle; - int n0 = getfield(lo, 8, 16); - int n1 = getfield(lo, 8, 8); - int n2 = getfield(lo, 8, 0); - argi(m, 0, "v0", n0 / 10, gfxd_Vtx); - argi(m, 1, "v1", n1 / 10, gfxd_Vtx); - argi(m, 2, "v2", n2 / 10, gfxd_Vtx); - argi(m, 3, "flag", getfield(lo, 8, 24), gfxd_Vtxflag); - int ret = 0; - if (n0 % 10 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 10 != 0) - { - badarg(m, 1); - ret = -1; - } - if (n2 % 10 != 0) - { - badarg(m, 2); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI) -UCFUNC int d_SP1Triangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SP1Triangle; - int n0 = getfield(lo, 8, 16); - int n1 = getfield(lo, 8, 8); - int n2 = getfield(lo, 8, 0); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "v1", n1 / 2, gfxd_Vtx); - argi(m, 2, "v2", n2 / 2, gfxd_Vtx); - argi(m, 3, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - if (n2 % 2 != 0) - { - badarg(m, 2); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SP1Triangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SP1Triangle; - int n0 = getfield(hi, 8, 16); - int n1 = getfield(hi, 8, 8); - int n2 = getfield(hi, 8, 0); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "v1", n1 / 2, gfxd_Vtx); - argi(m, 2, "v2", n2 / 2, gfxd_Vtx); - argi(m, 3, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - if (n2 % 2 != 0) - { - badarg(m, 2); - ret = -1; - } - return ret; -} -#endif - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_SP1Quadrangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo); -UCFUNC int d_SP2Triangles(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int n00 = getfield(hi, 8, 16); - int n01 = getfield(hi, 8, 8); - int n02 = getfield(hi, 8, 0); - int n10 = getfield(lo, 8, 16); - int n11 = getfield(lo, 8, 8); - int n12 = getfield(lo, 8, 0); -#if defined(F3DEX_GBI) - if (n00 == n10 && n02 == n11) - return d_SP1Quadrangle(m, hi, lo); -#endif - m->id = gfxd_SP2Triangles; - argi(m, 0, "v00", n00 / 2, gfxd_Vtx); - argi(m, 1, "v01", n01 / 2, gfxd_Vtx); - argi(m, 2, "v02", n02 / 2, gfxd_Vtx); - argi(m, 3, "flag0", 0, gfxd_Vtxflag); - argi(m, 4, "v10", n10 / 2, gfxd_Vtx); - argi(m, 5, "v11", n11 / 2, gfxd_Vtx); - argi(m, 6, "v12", n12 / 2, gfxd_Vtx); - argi(m, 7, "flag1", 0, gfxd_Vtxflag); - int ret = 0; - if (n00 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n01 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - if (n02 % 2 != 0) - { - badarg(m, 2); - ret = -1; - } - if (n10 % 2 != 0) - { - badarg(m, 4); - ret = -1; - } - if (n11 % 2 != 0) - { - badarg(m, 5); - ret = -1; - } - if (n12 % 2 != 0) - { - badarg(m, 6); - ret = -1; - } - return ret; -} - -UCFUNC int d_SP1Quadrangle(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SP1Quadrangle; - int n00 = getfield(hi, 8, 16); - int n01 = getfield(hi, 8, 8); - int n02 = getfield(hi, 8, 0); - int n10 = getfield(lo, 8, 16); - int n11 = getfield(lo, 8, 8); - int n12 = getfield(lo, 8, 0); - int v00 = n00 / 2; - int v01 = n01 / 2; - int v02 = n02 / 2; - int v10 = n10 / 2; - int v11 = n11 / 2; - int v12 = n12 / 2; - argi(m, 0, "v0", v00, gfxd_Vtx); - argi(m, 1, "v1", v01, gfxd_Vtx); - argi(m, 2, "v2", v11, gfxd_Vtx); - argi(m, 3, "v3", v12, gfxd_Vtx); - argi(m, 4, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (v00 != v10 || n00 % 2 != 0 || n10 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n01 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - if (v02 != v11 || n02 % 2 != 0 || n11 % 2 != 0) - { - badarg(m, 2); - ret = -1; - } - if (n12 % 2 != 0) - { - badarg(m, 3); - ret = -1; - } - return ret; -} - -UCFUNC int c_SPBranchLessZraw(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_DPHalf1) - return -1; - uint32_t branchdl = argvu(&m[0], 0); - if (m[1].id != gfxd_BranchZ) - return -1; - int32_t vtx = argvi(&m[1], 0); - int32_t zval = argvi(&m[1], 1); - m->id = gfxd_SPBranchLessZraw; - argu(m, 0, "dl", branchdl, gfxd_Dl); - argi(m, 1, "vtx", vtx, gfxd_Vtx); - argi(m, 2, "zval", zval, gfxd_Zraw); - return 0; -} -#endif - -UCFUNC int d_SPBranchList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPBranchList; - argu(m, 0, "dl", lo, gfxd_Dl); - return 0; -} - -UCFUNC int c_SPClipRatio(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 4) - return -1; - if (m[0].id != gfxd_MoveWd - || argvi(&m[0], 0) != G_MW_CLIP - || argvu(&m[0], 1) != G_MWO_CLIP_RNX) - { - return -1; - } - uint32_t r = argvu(&m[0], 2); - if (m[1].id != gfxd_MoveWd - || argvi(&m[1], 0) != G_MW_CLIP - || argvu(&m[1], 1) != G_MWO_CLIP_RNY - || argvu(&m[1], 2) != r) - { - return -1; - } - if (m[2].id != gfxd_MoveWd - || argvi(&m[2], 0) != G_MW_CLIP - || argvu(&m[2], 1) != G_MWO_CLIP_RPX - || ((uint32_t)1 << 16) - argvu(&m[2], 2) != r) - { - return -1; - } - if (m[3].id != gfxd_MoveWd - || argvi(&m[3], 0) != G_MW_CLIP - || argvu(&m[3], 1) != G_MWO_CLIP_RPY - || ((uint32_t)1 << 16) - argvu(&m[3], 2) != r) - { - return -1; - } - m->id = gfxd_SPClipRatio; - argi(m, 0, "r", r, gfxd_Cr); - return 0; -} - -#if defined(F3D_GBI) -UCFUNC int d_SPCullDisplayList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPCullDisplayList; - int n0 = getfield(hi, 24, 0); - int nn = getfield(lo, 16, 0); - argi(m, 0, "v0", n0 / 40, gfxd_Vtx); - argi(m, 1, "vn", nn / 40 - 1, gfxd_Num); - int ret = 0; - if (n0 % 40 != 0) - { - badarg(m, 0); - ret = -1; - } - if (nn % 40 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_SPCullDisplayList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPCullDisplayList; - int n0 = getfield(hi, 16, 0); - int nn = getfield(lo, 16, 0); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "vn", nn / 2, gfxd_Num); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (nn % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#endif - -UCFUNC int d_SPDisplayList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPDisplayList; - argu(m, 0, "dl", lo, gfxd_Dl); - return 0; -} - -UCFUNC int d_SPEndDisplayList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPEndDisplayList; - return 0; -} - -UCFUNC int d_SPFogFactor(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPFogFactor; - argi(m, 0, "fm", sx(getfield(lo, 16, 16), 16), gfxd_Fogz); - argi(m, 1, "fo", sx(getfield(lo, 16, 0), 16), gfxd_Fogz); - return 0; -} - -UCFUNC int d_SPFogPosition(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int x = sx(getfield(lo, 16, 16), 16); - int y = sx(getfield(lo, 16, 0), 16); - if (x == 0) - return d_SPFogFactor(m, hi, lo); - else - { - int d = 128000 / x; - int yd = y * d; - if (yd > 0) - yd += 255; - else if (yd < 0) - yd -= 255; - int min = 500 - yd / 256; - int max = d + min; - - if (min >= 0 && min <= 1000 && max >= 0 && max <= 1000) - { - m->id = gfxd_SPFogPosition; - argi(m, 0, "min", min, gfxd_Fogp); - argi(m, 1, "max", max, gfxd_Fogp); - return 0; - } - else - return d_SPFogFactor(m, hi, lo); - } -} - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int c_SPForceMatrix(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 4) - return -1; - for (int i = 0; i < 4; i++) - if (m[i].id != gfxd_MoveMem - || argvu(&m[i], 0) != 16 - || argvu(&m[i], 2) != argvu(&m[0], 2) + i * 16) - { - return -1; - } - if (argvi(&m[0], 1) != G_MV_MATRIX_1 - || argvi(&m[1], 1) != G_MV_MATRIX_2 - || argvi(&m[2], 1) != G_MV_MATRIX_3 - || argvi(&m[3], 1) != G_MV_MATRIX_4) - { - return -1; - } - uint32_t mptr = argvu(&m[0], 2); - m->id = gfxd_SPForceMatrix; - argu(m, 0, "mptr", mptr, gfxd_Mtxptr); - return 0; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int c_SPForceMatrix(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_MoveMem - || argvu(&m[0], 0) != sizeof(Mtx) - || argvi(&m[0], 1) != G_MV_MATRIX - || argvu(&m[0], 2) != 0) - { - return -1; - } - uint32_t mptr = argvu(&m[0], 3); - if (m[1].id != gfxd_MoveWd - || argvi(&m[1], 0) != G_MW_FORCEMTX - || argvu(&m[1], 1) != 0 - || argvu(&m[1], 2) != 0x10000) - { - return -1; - } - m->id = gfxd_SPForceMatrix; - argu(m, 0, "mptr", mptr, gfxd_Mtxptr); - return 0; -} -#endif - -UCFUNC int d_SPSetGeometryMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPSetGeometryMode; - argu(m, 0, "mode", lo, gfxd_Gm); - return 0; -} - -UCFUNC int d_SPClearGeometryMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPClearGeometryMode; -#if defined(F3D_GBI) || defined(F3DEX_GBI) - argu(m, 0, "mode", lo, gfxd_Gm); -#elif defined(F3DEX_GBI_2) - argu(m, 0, "mode", getfield(~hi, 24, 0), gfxd_Gm); -#endif - return 0; -} - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int c_SPLoadGeometryMode(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_SPClearGeometryMode - || argvu(&m[0], 0) != 0xFFFFFFFF - || m[1].id != gfxd_SPSetGeometryMode) - { - return -1; - } - uint32_t mode = argvu(&m[1], 0); - m->id = gfxd_SPLoadGeometryMode; - argu(m, 0, "mode", mode, gfxd_Gm); - return 0; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPLoadGeometryMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLoadGeometryMode; - argu(m, 0, "mode", lo, gfxd_Gm); - return 0; -} -#endif - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int d_SPInsertMatrix(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPInsertMatrix; - argu(m, 0, "where", getfield(hi, 16, 8), gfxd_Mwo_matrix); - argu(m, 1, "val", lo, gfxd_Word); - return 0; -} -#endif - -#if defined(F3D_GBI) -UCFUNC int d_SPLine3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLine3D; - int n0 = getfield(lo, 8, 16); - int n1 = getfield(lo, 8, 8); - argi(m, 0, "v0", n0 / 10, gfxd_Vtx); - argi(m, 1, "v1", n1 / 10, gfxd_Vtx); - argi(m, 2, "flag", getfield(lo, 8, 24), gfxd_Vtxflag); - int ret = 0; - if (n0 % 10 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 10 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI) -UCFUNC int d_SPLine3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLine3D; - int n0 = getfield(lo, 8, 16); - int n1 = getfield(lo, 8, 8); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "v1", n1 / 2, gfxd_Vtx); - argi(m, 2, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPLine3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLine3D; - int n0 = getfield(hi, 8, 16); - int n1 = getfield(hi, 8, 8); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "v1", n1 / 2, gfxd_Vtx); - argi(m, 2, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#endif - -#if defined(F3D_GBI) -UCFUNC int d_SPLineW3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int wd = getfield(lo, 8, 0); - if (wd == 0) - return d_SPLine3D(m, hi, lo); - else - { - m->id = gfxd_SPLineW3D; - int n0 = getfield(lo, 8, 16); - int n1 = getfield(lo, 8, 8); - argi(m, 0, "v0", n0 / 10, gfxd_Vtx); - argi(m, 1, "v1", n1 / 10, gfxd_Vtx); - argi(m, 2, "wd", wd, gfxd_Linewd); - argi(m, 3, "flag", getfield(lo, 8, 24), gfxd_Vtxflag); - int ret = 0; - if (n0 % 10 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 10 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; - } -} -#elif defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_SPLineW3D(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int wd = getfield(hi, 8, 0); - if (wd == 0) - return d_SPLine3D(m, hi, lo); - else - { - m->id = gfxd_SPLineW3D; - int n0 = getfield(hi, 8, 16); - int n1 = getfield(hi, 8, 8); - argi(m, 0, "v0", n0 / 2, gfxd_Vtx); - argi(m, 1, "v1", n1 / 2, gfxd_Vtx); - argi(m, 2, "wd", wd, gfxd_Linewd); - argi(m, 3, "flag", 0, gfxd_Vtxflag); - int ret = 0; - if (n0 % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - if (n1 % 2 != 0) - { - badarg(m, 1); - ret = -1; - } - return ret; - } -} -#endif - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int c_SPLoadUcode(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_DPHalf1) - return -1; - uint32_t uc_dstart = argvu(&m[0], 0); - if (m[1].id != gfxd_LoadUcode) - return -1; - uint32_t uc_start = argvu(&m[1], 0); - uint32_t uc_dsize = argvu(&m[1], 1); - if (uc_dsize != 0x800) - return -1; - m->id = gfxd_SPLoadUcode; - argu(m, 0, "uc_start", uc_start, gfxd_Uctext); - argu(m, 1, "uc_dstart", uc_dstart, gfxd_Ucdata); - return 0; -} -#endif - -UCFUNC int d_SPLookAtX(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLookAtX; - argu(m, 0, "l", lo, gfxd_Lookatptr); - return 0; -} - -UCFUNC int d_SPLookAtY(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPLookAtY; - argu(m, 0, "l", lo, gfxd_Lookatptr); - return 0; -} - -UCFUNC int c_SPLookAt(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_SPLookAtX) - return -1; - uint32_t l = argvu(&m[0], 0); - if (m[1].id != gfxd_SPLookAtY || argvu(&m[1], 0) != l + 0x10) - return -1; - m->id = gfxd_SPLookAt; - argu(m, 0, "l", l, gfxd_Lookatptr); - return 0; -} - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int d_SPMatrix(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPMatrix; - int x = getfield(hi, 16, 0); - argu(m, 0, "matrix", lo, gfxd_Mtxptr); - argi(m, 1, "param", getfield(hi, 8, 16), gfxd_Mtxparam); - if (x != sizeof(Mtx)) - return -1; - else - return 0; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPMatrix(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPMatrix; - int x = getfield(hi, 5, 19); - argu(m, 0, "matrix", lo, gfxd_Mtxptr); - argi(m, 1, "param", getfield(hi, 8, 0) ^ G_MTX_PUSH, gfxd_Mtxparam); - if (x != (sizeof(Mtx) - 1) / 8) - return -1; - else - return 0; -} -#endif - -#if defined(F3D_GBI) || (defined(F3D_BETA) && defined(F3DEX_GBI)) -UCFUNC int d_SPModifyVertex(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPModifyVertex; - int offset = getfield(hi, 16, 8); - argi(m, 0, "vtx", offset / 40, gfxd_Vtx); - argu(m, 1, "where", offset % 40, gfxd_Mwo_point); - argu(m, 2, "val", lo, gfxd_Word); - return 0; -} -#elif defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_SPModifyVertex(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPModifyVertex; - int vtx = getfield(hi, 16, 0); - argi(m, 0, "vtx", vtx / 2, gfxd_Vtx); - argu(m, 1, "where", getfield(hi, 8, 16), gfxd_Mwo_point); - argu(m, 2, "val", lo, gfxd_Word); - int ret = 0; - if (vtx % 2 != 0) - { - badarg(m, 0); - ret = -1; - } - return ret; -} -#endif - -UCFUNC int d_SPPerspNormalize(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPPerspNormalize; - argu(m, 0, "scale", getfield(lo, 16, 0), gfxd_Wscale); - return 0; -} - -UCFUNC int d_SPPopMatrix(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPPopMatrix; -#if defined(F3D_GBI) || defined(F3DEX_GBI) - argi(m, 0, "param", lo, gfxd_Mtxstack); -#elif defined(F3DEX_GBI_2) - argi(m, 0, "param", G_MTX_MODELVIEW, gfxd_Mtxstack); -#endif - return 0; -} - -#if defined(F3DEX_GBI_2) -UCFUNC int d_SPPopMatrixN(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int len = (getfield(hi, 5, 19) + 1) * 8; - int ofs = getfield(hi, 8, 8) * 8; - int idx = getfield(hi, 8, 0); - int n = lo / sizeof(Mtx); - if (lo % sizeof(Mtx) == 0 - && len == sizeof(Mtx) - && ofs == 0 - && idx == 2 - && n == 1) - { - return d_SPPopMatrix(m, hi, lo); - } - m->id = gfxd_SPPopMatrixN; - argi(m, 0, "param", G_MTX_MODELVIEW, gfxd_Mtxstack); - argi(m, 1, "num", n, gfxd_Num); - int ret = 0; - if (lo % sizeof(Mtx) != 0) - { - badarg(m, 1); - ret = -1; - } - if (len != sizeof(Mtx) || ofs != 0 || idx != 2) - ret = -1; - return ret; -} -#endif - -UCFUNC int d_SPSegment(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPSegment; -#if defined(F3D_GBI) || defined(F3DEX_GBI) - int offset = getfield(hi, 16, 8); -#elif defined(F3DEX_GBI_2) - int offset = getfield(hi, 16, 0); -#endif - argu(m, 0, "seg", offset / 4, gfxd_Seg); - argu(m, 1, "base", lo, gfxd_Segptr); - int ret = 0; - if (offset % 4 != 0) - { - badarg(m, 0); - ret = -1; - } - return ret; -} - -UCFUNC int c_SPSetLightsN(gfxd_macro_t *m, int n_macro, int id, int numlights) -{ - if (n_macro < 2 + numlights) - return -1; - if (m[0].id != gfxd_SPNumLights || argvi(&m[0], 0) != numlights) - return -1; - int a = 1 + numlights; - if (m[a].id != gfxd_SPLight || argvi(&m[a], 1) != a) - return -1; - uint32_t l = argvu(&m[a], 0); - for (int i = 1; i <= numlights; i++) - { - int offset = sizeof(Ambient) + sizeof(Light) * (i - 1); - if (m[i].id != gfxd_SPLight - || argvu(&m[i], 0) != l + offset - || argvi(&m[i], 1) != i) - { - return -1; - } - } - m->id = id; - argu(m, 0, "l", l, gfxd_Lightsn); - return 0; -} - -UCFUNC int c_SPSetLights1(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights1, NUMLIGHTS_1); -} - -UCFUNC int c_SPSetLights2(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights2, NUMLIGHTS_2); -} - -UCFUNC int c_SPSetLights3(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights3, NUMLIGHTS_3); -} - -UCFUNC int c_SPSetLights4(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights4, NUMLIGHTS_4); -} - -UCFUNC int c_SPSetLights5(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights5, NUMLIGHTS_5); -} - -UCFUNC int c_SPSetLights6(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights6, NUMLIGHTS_6); -} - -UCFUNC int c_SPSetLights7(gfxd_macro_t *m, int n_macro) -{ - return c_SPSetLightsN(m, n_macro, gfxd_SPSetLights7, NUMLIGHTS_7); -} - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int d_SPNumLights(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPNumLights; - argi(m, 0, "n", (lo - 0x80000000) / 32 - 1, gfxd_Numlights); - int ret = 0; - if (lo < 0x80000040 || lo % 32 != 0) - { - badarg(m, 0); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPNumLights(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPNumLights; - argi(m, 0, "n", lo / 24, gfxd_Numlights); - int ret = 0; - if (lo < 24 || lo % 24 != 0) - { - badarg(m, 0); - ret = -1; - } - return ret; -} -#endif - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int d_SPLight(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int n = (getfield(hi, 8, 16) - G_MV_L0) / 2 + 1; - m->id = gfxd_SPLight; - argu(m, 0, "l", lo, gfxd_Lightptr); - argi(m, 1, "n", n, gfxd_Num); - return 0; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPLight(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int n = (getfield(hi, 8, 8) * 8 / 24) - 1; - m->id = gfxd_SPLight; - argu(m, 0, "l", lo, gfxd_Lightptr); - argi(m, 1, "n", n, gfxd_Num); - return 0; -} -#endif - -UCFUNC int c_SPLightColor(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_MoveWd - || argvi(&m[0], 0) != G_MW_LIGHTCOL - || argvu(&m[0], 1) % 0x18 != 0 - || argvu(&m[0], 1) > G_MWO_aLIGHT_8) - { - return -1; - } - uint32_t offset = argvu(&m[0], 1); - uint32_t packedcolor = argvu(&m[0], 2); - if (m[1].id != gfxd_MoveWd - || argvi(&m[1], 0) != G_MW_LIGHTCOL - || argvu(&m[1], 1) != offset + 4 - || argvu(&m[1], 2) != packedcolor) - { - return -1; - } - m->id = gfxd_SPLightColor; - argi(m, 0, "n", offset / 0x18 + 1, gfxd_Lightnum); - argu(m, 1, "c", packedcolor, gfxd_Color); - return 0; -} - -UCFUNC int d_SPTexture(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPTexture; - argu(m, 0, "sc", getfield(lo, 16, 16), gfxd_Tcscale); - argu(m, 1, "tc", getfield(lo, 16, 0), gfxd_Tcscale); - argi(m, 2, "level", getfield(hi, 3, 11), gfxd_Num); - argi(m, 3, "tile", getfield(hi, 3, 8), gfxd_Tile); -#if defined(F3D_GBI) || defined(F3DEX_GBI) - argi(m, 4, "on", getfield(hi, 8, 0), gfxd_Switch); -#elif defined(F3DEX_GBI_2) - argi(m, 4, "on", getfield(hi, 7, 1), gfxd_Switch); -#endif - return 0; -} - -UCFUNC int c_SPTextureRectangle(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 3) - return -1; - if (m[0].id != gfxd_TexRect) - return -1; - qu102_t ulx = argvu(&m[0], 0); - qu102_t uly = argvu(&m[0], 1); - qu102_t lrx = argvu(&m[0], 2); - qu102_t lry = argvu(&m[0], 3); - int tile = argvi(&m[0], 4); - if (m[1].id != gfxd_DPHalf1) - return -1; - qs105_t s = sx(getfield(argvu(&m[1], 0), 16, 16), 16); - qs105_t t = sx(getfield(argvu(&m[1], 0), 16, 0), 16); - if (m[2].id != gfxd_DPHalf2) - return -1; - qs510_t dsdx = sx(getfield(argvu(&m[2], 0), 16, 16), 16); - qs510_t dtdy = sx(getfield(argvu(&m[2], 0), 16, 0), 16); - m->id = gfxd_SPTextureRectangle; - argu(m, 0, "ulx", ulx, gfxd_Coordq); - argu(m, 1, "uly", uly, gfxd_Coordq); - argu(m, 2, "lrx", lrx, gfxd_Coordq); - argu(m, 3, "lry", lry, gfxd_Coordq); - argi(m, 4, "tile", tile, gfxd_Tile); - argi(m, 5, "s", s, gfxd_St); - argi(m, 6, "t", t, gfxd_St); - argi(m, 7, "dsdx", dsdx, gfxd_Stdelta); - argi(m, 8, "dtdy", dtdy, gfxd_Stdelta); - return 0; -} - -UCFUNC int c_SPTextureRectangleFlip(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 3) - return -1; - if (m[0].id != gfxd_TexRectFlip) - return -1; - qu102_t ulx = argvu(&m[0], 0); - qu102_t uly = argvu(&m[0], 1); - qu102_t lrx = argvu(&m[0], 2); - qu102_t lry = argvu(&m[0], 3); - int tile = argvi(&m[0], 4); - if (m[1].id != gfxd_DPHalf1) - return -1; - qs105_t s = sx(getfield(argvu(&m[1], 0), 16, 16), 16); - qs105_t t = sx(getfield(argvu(&m[1], 0), 16, 0), 16); - if (m[2].id != gfxd_DPHalf2) - return -1; - qs510_t dsdx = sx(getfield(argvu(&m[2], 0), 16, 16), 16); - qs510_t dtdy = sx(getfield(argvu(&m[2], 0), 16, 0), 16); - m->id = gfxd_SPTextureRectangleFlip; - argu(m, 0, "ulx", ulx, gfxd_Coordq); - argu(m, 1, "uly", uly, gfxd_Coordq); - argu(m, 2, "lrx", lrx, gfxd_Coordq); - argu(m, 3, "lry", lry, gfxd_Coordq); - argi(m, 4, "tile", tile, gfxd_Tile); - argi(m, 5, "s", s, gfxd_St); - argi(m, 6, "t", t, gfxd_St); - argi(m, 7, "dsdx", dsdx, gfxd_Stdelta); - argi(m, 8, "dtdy", dtdy, gfxd_Stdelta); - return 0; -} - -#if defined(F3D_GBI) -UCFUNC int d_SPVertex(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPVertex; - int n = getfield(hi, 4, 20) + 1; - int v0 = getfield(hi, 4, 16); - int size = getfield(hi, 16, 0); - argu(m, 0, "v", lo, gfxd_Vtxptr); - argi(m, 1, "n", n, gfxd_Num); - argi(m, 2, "v0", v0, gfxd_Vtx); - int ret = 0; - if (size != sizeof(Vtx) * n) - { - badarg(m, 1); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI) -UCFUNC int d_SPVertex(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPVertex; - int n = getfield(hi, 6, 10); - int v0 = getfield(hi, 8, 16); - int size = getfield(hi, 10, 0); - argu(m, 0, "v", lo, gfxd_Vtxptr); - argi(m, 1, "n", n, gfxd_Num); - argi(m, 2, "v0", v0 / 2, gfxd_Vtx); - int ret = 0; - if (size != sizeof(Vtx) * n - 1) - { - badarg(m, 1); - ret = -1; - } - if (v0 % 2 != 0) - { - badarg(m, 2); - ret = -1; - } - return ret; -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_SPVertex(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPVertex; - int n = getfield(hi, 8, 12); - int v0 = getfield(hi, 7, 1) - n; - argu(m, 0, "v", lo, gfxd_Vtxptr); - argi(m, 1, "n", n, gfxd_Num); - argi(m, 2, "v0", v0, gfxd_Vtx); - return 0; -} -#endif - -UCFUNC int d_SPViewport(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPViewport; - argu(m, 0, "v", lo, gfxd_Vpptr); - return 0; -} - -UCFUNC int d_DPLoadTLUTCmd(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPLoadTLUTCmd; - argi(m, 0, "tile", getfield(lo, 3, 24), gfxd_Tile); - argi(m, 1, "count", getfield(lo, 10, 14), gfxd_Num); - return 0; -} - -UCFUNC int c_DPLoadTLUT(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 6) - return -1; - if (m[0].id != gfxd_DPSetTextureImage - || argvi(&m[0], 0) != G_IM_FMT_RGBA - || argvi(&m[0], 1) != G_IM_SIZ_16b - || argvi(&m[0], 2) != 1) - { - return -1; - } - uint32_t dram = argvu(&m[0], 3); - if (m[1].id != gfxd_DPTileSync) - return -1; - if (m[2].id != gfxd_DPSetTile - || argvi(&m[2], 0) != 0 - || argvi(&m[2], 1) != 0 - || argvi(&m[2], 2) != 0 - || argvi(&m[2], 4) != G_TX_LOADTILE - || argvi(&m[2], 5) != 0 - || argvu(&m[2], 6) != 0 - || argvi(&m[2], 7) != 0 - || argvi(&m[2], 8) != 0 - || argvu(&m[2], 9) != 0 - || argvi(&m[2], 10) != 0 - || argvi(&m[2], 11) != 0) - { - return -1; - } - uint32_t tmem = argvu(&m[2], 3); - if (m[3].id != gfxd_DPLoadSync) - return -1; - if (m[4].id != gfxd_DPLoadTLUTCmd || argvi(&m[4], 0) != G_TX_LOADTILE) - return -1; - int count = argvi(&m[4], 1) + 1; - if (m[5].id != gfxd_DPPipeSync) - return -1; - m->id = gfxd_DPLoadTLUT; - argi(m, 0, "count", count, gfxd_Num); - argu(m, 1, "tmem", tmem, gfxd_Tmem); - argu(m, 2, "dram", dram, gfxd_Tlut); - return 0; -} - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_BranchZ(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_BranchZ; - int na = getfield(hi, 12, 12); - int nb = getfield(hi, 12, 0); - int32_t zval; - if (lo > 0x7FFFFFFF) - zval = INT32_MIN + (int32_t)(lo & 0x7FFFFFFF); - else - zval = lo; - argi(m, 0, "vtx", nb / 2, gfxd_Vtx); - argi(m, 1, "zval", zval, gfxd_Zraw); - int ret = 0; - if (nb % 2 != 0 || na / 5 != nb / 2 || na % 5 != 0) - { - badarg(m, 0); - ret = -1; - } - return ret; -} -#endif - -UCFUNC int d_DisplayList(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int flag = getfield(hi, 8, 16); - if (flag == 0) - return d_SPDisplayList(m, hi, lo); - else if (flag == 1) - return d_SPBranchList(m, hi, lo); - else - { - m->id = gfxd_DisplayList; - argu(m, 0, "dl", lo, gfxd_Dl); - argi(m, 1, "flag", flag, gfxd_Dlflag); - return 0; - } -} - -UCFUNC int d_DPHalf1(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPHalf1; - argu(m, 0, "hi", lo, gfxd_Word); - return 0; -} - -UCFUNC int d_DPHalf2(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPHalf2; - argu(m, 0, "lo", lo, gfxd_Word); - return 0; -} - -UCFUNC int c_DPWord(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_DPHalf1 || m[1].id != gfxd_DPHalf2) - return -1; - uint32_t wordhi = argvu(&m[0], 0); - uint32_t wordlo = argvu(&m[1], 0); - m->id = gfxd_DPWord; - argu(m, 0, "wordhi", wordhi, gfxd_Word); - argu(m, 1, "wordlo", wordlo, gfxd_Word); - return 0; -} - -UCFUNC int d_DPLoadTile(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPLoadTile; - argi(m, 0, "tile", getfield(lo, 3, 24), gfxd_Tile); - argu(m, 1, "uls", getfield(hi, 12, 12), gfxd_Coordq); - argu(m, 2, "ult", getfield(hi, 12, 0), gfxd_Coordq); - argu(m, 3, "lrs", getfield(lo, 12, 12), gfxd_Coordq); - argu(m, 4, "lrt", getfield(lo, 12, 0), gfxd_Coordq); - return 0; -} - -#if defined(F3DEX_GBI_2) -UCFUNC int d_SPGeometryMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - uint32_t clearbits = getfield(~hi, 24, 0); - uint32_t setbits = lo; - if (clearbits == 0 && setbits != 0) - return d_SPSetGeometryMode(m, hi, lo); - else if (clearbits != 0 && setbits == 0) - return d_SPClearGeometryMode(m, hi, lo); - else if (clearbits == 0x00FFFFFF) - return d_SPLoadGeometryMode(m, hi, lo); - else - { - m->id = gfxd_SPGeometryMode; - argu(m, 0, "c", clearbits, gfxd_Gm); - argu(m, 1, "s", setbits, gfxd_Gm); - return 0; - } -} -#endif - -UCFUNC int d_SPSetOtherMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPSetOtherMode; - int opc = getfield(hi, 8, 24); -#if defined(F3D_GBI) || defined(F3DEX_GBI) - int length = getfield(hi, 8, 0); - int shift = getfield(hi, 8, 8); -#elif defined(F3DEX_GBI_2) - int length = getfield(hi, 8, 0) + 1; - int shift = 32 - (getfield(hi, 8, 8) + length); -#endif - argi(m, 0, "opc", opc, gfxd_Opcode); - argi(m, 1, "sft", shift, gfxd_Sftlo); - argi(m, 2, "len", length, gfxd_Num); - if (opc == G_SETOTHERMODE_H) - argu(m, 3, "mode", lo, gfxd_Othermodehi); - else if (opc == G_SETOTHERMODE_L) - argu(m, 3, "mode", lo, gfxd_Othermodelo); - else - argu(m, 3, "mode", lo, gfxd_Word); - return 0; -} - -UCFUNC int d_SPSetOtherModeLo(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ -#if defined(F3D_GBI) || defined(F3DEX_GBI) - int length = getfield(hi, 8, 0); - int shift = getfield(hi, 8, 8); -#elif defined(F3DEX_GBI_2) - int length = getfield(hi, 8, 0) + 1; - int shift = 32 - (getfield(hi, 8, 8) + length); -#endif - if (shift == G_MDSFT_ALPHACOMPARE && length == G_MDSIZ_ALPHACOMPARE) - return d_DPSetAlphaCompare(m, hi, lo); - else if (shift == G_MDSFT_ZSRCSEL && length == G_MDSIZ_ZSRCSEL) - return d_DPSetDepthSource(m, hi, lo); - else if (shift == G_MDSFT_RENDERMODE && length == G_MDSIZ_RENDERMODE) - return d_DPSetRenderMode(m, hi, lo); - else if (config.emit_ext_macro) - { - m->id = gfxd_SPSetOtherModeLo; - argi(m, 0, "sft", shift, gfxd_Sftlo); - argi(m, 1, "len", length, gfxd_Num); - argu(m, 2, "mode", lo, gfxd_Othermodelo); - return 0; - } - else - return d_SPSetOtherMode(m, hi, lo); -} - -UCFUNC int d_SPSetOtherModeHi(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ -#if defined(F3D_GBI) || defined(F3DEX_GBI) - int length = getfield(hi, 8, 0); - int shift = getfield(hi, 8, 8); -#elif defined(F3DEX_GBI_2) - int length = getfield(hi, 8, 0) + 1; - int shift = 32 - (getfield(hi, 8, 8) + length); -#endif - if (shift == G_MDSFT_ALPHADITHER && length == G_MDSIZ_ALPHADITHER) - return d_DPSetAlphaDither(m, hi, lo); - else if (shift == G_MDSFT_RGBDITHER && length == G_MDSIZ_RGBDITHER) - return d_DPSetColorDither(m, hi, lo); - else if (shift == G_MDSFT_COMBKEY && length == G_MDSIZ_COMBKEY) - return d_DPSetCombineKey(m, hi, lo); - else if (shift == G_MDSFT_TEXTCONV && length == G_MDSIZ_TEXTCONV) - return d_DPSetTextureConvert(m, hi, lo); - else if (shift == G_MDSFT_TEXTFILT && length == G_MDSIZ_TEXTFILT) - return d_DPSetTextureFilter(m, hi, lo); - else if (shift == G_MDSFT_TEXTLUT && length == G_MDSIZ_TEXTLUT) - return d_DPSetTextureLUT(m, hi, lo); - else if (shift == G_MDSFT_TEXTLOD && length == G_MDSIZ_TEXTLOD) - return d_DPSetTextureLOD(m, hi, lo); - else if (shift == G_MDSFT_TEXTDETAIL && length == G_MDSIZ_TEXTDETAIL) - return d_DPSetTextureDetail(m, hi, lo); - else if (shift == G_MDSFT_TEXTPERSP && length == G_MDSIZ_TEXTPERSP) - return d_DPSetTexturePersp(m, hi, lo); - else if (shift == G_MDSFT_CYCLETYPE && length == G_MDSIZ_CYCLETYPE) - return d_DPSetCycleType(m, hi, lo); - else if (shift == G_MDSFT_PIPELINE && length == G_MDSIZ_PIPELINE) - return d_DPPipelineMode(m, hi, lo); - else if (config.emit_ext_macro) - { - m->id = gfxd_SPSetOtherModeHi; - argi(m, 0, "sft", shift, gfxd_Sfthi); - argi(m, 1, "len", length, gfxd_Num); - argu(m, 2, "mode", lo, gfxd_Othermodehi); - return 0; - } - else - return d_SPSetOtherMode(m, hi, lo); -} - -UCFUNC int d_DPSetOtherMode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_DPSetOtherMode; - argu(m, 0, "hi", getfield(hi, 24, 0), gfxd_Othermodehi); - argu(m, 1, "lo", lo, gfxd_Othermodelo); - return 0; -} - -UCFUNC int d_MoveWd(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ -#if defined(F3D_GBI) || defined(F3DEX_GBI) - int index = getfield(hi, 8, 0); - int offset = getfield(hi, 16, 8); -#elif defined(F3DEX_GBI_2) - int index = getfield(hi, 8, 16); - int offset = getfield(hi, 16, 0); -#endif - if (index == G_MW_FOG && offset == G_MWO_FOG) - return d_SPFogPosition(m, hi, lo); -#if !(defined(F3D_BETA) && (defined(F3D_GBI) || defined(F3DEX_GBI))) - else if (index == G_MW_PERSPNORM && offset == 0) - return d_SPPerspNormalize(m, hi, lo); -#endif - else if (index == G_MW_SEGMENT) - return d_SPSegment(m, hi, lo); - else if (index == G_MW_NUMLIGHT && offset == G_MWO_NUMLIGHT) - return d_SPNumLights(m, hi, lo); -#if defined(F3D_GBI) || (defined(F3D_BETA) && defined(F3DEX_GBI)) - else if (index == G_MW_POINTS) - return d_SPModifyVertex(m, hi, lo); -#endif -#if defined(F3D_GBI) || defined(F3DEX_GBI) - else if (index == G_MW_MATRIX) - return d_SPInsertMatrix(m, hi, lo); -#endif - else - { - m->id = gfxd_MoveWd; - argi(m, 0, "index", index, gfxd_Mw); - if (index == G_MW_MATRIX) - argu(m, 1, "offset", offset, gfxd_Mwo_matrix); - else if (index == G_MW_CLIP) - argu(m, 1, "offset", offset, gfxd_Mwo_clip); - else if (index == G_MW_LIGHTCOL) - argu(m, 1, "offset", offset, gfxd_Mwo_lightcol); - else - argu(m, 1, "offset", offset, gfxd_Mwo); - argu(m, 2, "value", lo, gfxd_Word); - } - return 0; -} - -#if defined(F3D_GBI) || defined(F3DEX_GBI) -UCFUNC int d_MoveMem(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int size = getfield(hi, 16, 0); - int index = getfield(hi, 8, 16); - if (size == sizeof(Light) - && index >= G_MV_L0 - && index <= G_MV_L7 - && index % 2 == 0) - { - return d_SPLight(m, hi, lo); - } - else if (size == sizeof(Light) && index == G_MV_LOOKATX) - return d_SPLookAtX(m, hi, lo); - else if (size == sizeof(Light) && index == G_MV_LOOKATY) - return d_SPLookAtY(m, hi, lo); - else if (size == sizeof(Vp) && index == G_MV_VIEWPORT) - return d_SPViewport(m, hi, lo); - else - { - m->id = gfxd_MoveMem; - argu(m, 0, "size", size, gfxd_Size); - argi(m, 1, "index", index, gfxd_Mv); - argu(m, 2, "dram", lo, gfxd_Dram); - return 0; - } -} -#elif defined(F3DEX_GBI_2) -UCFUNC int d_MoveMem(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int size = (getfield(hi, 5, 19) + 1) * 8; - int index = getfield(hi, 8, 0); - int offset = getfield(hi, 8, 8) * 8; - if (size == sizeof(Light) - && index == G_MV_LIGHT - && offset >= G_MVO_L0 - && offset <= G_MVO_L7 - && offset % 0x18 == 0) - { - return d_SPLight(m, hi, lo); - } - else if (size == sizeof(Light) - && index == G_MV_LIGHT - && offset == G_MVO_LOOKATX) - { - return d_SPLookAtX(m, hi, lo); - } - else if (size == sizeof(Light) - && index == G_MV_LIGHT - && offset == G_MVO_LOOKATY) - { - return d_SPLookAtY(m, hi, lo); - } - else if (size == sizeof(Vp) - && index == G_MV_VIEWPORT - && offset == 0) - { - return d_SPViewport(m, hi, lo); - } - else - { - m->id = gfxd_MoveMem; - argu(m, 0, "size", size, gfxd_Size); - argi(m, 1, "index", index, gfxd_Mv); - argu(m, 2, "offset", offset, gfxd_Size); - argu(m, 3, "dram", lo, gfxd_Dram); - return 0; - } -} -#endif - -#if defined(F3DEX_GBI_2) -UCFUNC int d_SPDmaRead(gfxd_macro_t *m, uint32_t hi, uint32_t lo); -UCFUNC int d_SPDmaWrite(gfxd_macro_t *m, uint32_t hi, uint32_t lo); -UCFUNC int d_SPDma_io(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - int flag = getfield(hi, 1, 23); - if (flag == 0) - return d_SPDmaRead(m, hi, lo); - else if (flag == 1) - return d_SPDmaWrite(m, hi, lo); - else - { - m->id = gfxd_SPDma_io; - argi(m, 0, "flag", flag, gfxd_Dmaflag); - argu(m, 1, "dmem", getfield(hi, 10, 13) * 8, gfxd_Dmem); - argu(m, 2, "dram", lo, gfxd_Dram); - argu(m, 3, "size", getfield(hi, 12, 10) + 1, gfxd_Size); - return 0; - } -} - -UCFUNC int d_SPDmaRead(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPDmaRead; - argu(m, 0, "dmem", getfield(hi, 10, 13) * 8, gfxd_Dmem); - argu(m, 1, "dram", lo, gfxd_Dram); - argu(m, 2, "size", getfield(hi, 12, 10) + 1, gfxd_Size); - return 0; -} - -UCFUNC int d_SPDmaWrite(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPDmaWrite; - argu(m, 0, "dmem", getfield(hi, 10, 13) * 8, gfxd_Dmem); - argu(m, 1, "dram", lo, gfxd_Dram); - argu(m, 2, "size", getfield(hi, 12, 10) + 1, gfxd_Size); - return 0; -} -#endif - -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) -UCFUNC int d_LoadUcode(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_LoadUcode; - argu(m, 0, "uc_start", lo, gfxd_Uctext); - argu(m, 1, "uc_dsize", getfield(hi, 16, 0) + 1, gfxd_Size); - return 0; -} - -UCFUNC int c_SPLoadUcodeEx(gfxd_macro_t *m, int n_macro) -{ - if (n_macro < 2) - return -1; - if (m[0].id != gfxd_DPHalf1) - return -1; - uint32_t uc_dstart = argvu(&m[0], 0); - if (m[1].id != gfxd_LoadUcode) - return -1; - uint32_t uc_start = argvu(&m[1], 0); - uint32_t uc_dsize = argvu(&m[1], 1); - m->id = gfxd_SPLoadUcodeEx; - argu(m, 0, "uc_start", uc_start, gfxd_Uctext); - argu(m, 1, "uc_dstart", uc_dstart, gfxd_Ucdata); - argu(m, 2, "uc_dsize", uc_dsize, gfxd_Size); - return 0; -} -#endif - -UCFUNC int d_TexRect(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_TexRect; - argu(m, 0, "ulx", getfield(lo, 12, 12), gfxd_Coordq); - argu(m, 1, "uly", getfield(lo, 12, 0), gfxd_Coordq); - argu(m, 2, "lrx", getfield(hi, 12, 12), gfxd_Coordq); - argu(m, 3, "lry", getfield(hi, 12, 0), gfxd_Coordq); - argi(m, 4, "tile", getfield(lo, 3, 24), gfxd_Tile); - return 0; -} - -UCFUNC int d_TexRectFlip(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_TexRectFlip; - argu(m, 0, "ulx", getfield(lo, 12, 12), gfxd_Coordq); - argu(m, 1, "uly", getfield(lo, 12, 0), gfxd_Coordq); - argu(m, 2, "lrx", getfield(hi, 12, 12), gfxd_Coordq); - argu(m, 3, "lry", getfield(hi, 12, 0), gfxd_Coordq); - argi(m, 4, "tile", getfield(lo, 3, 24), gfxd_Tile); - return 0; -} - -UCFUNC int d_SPNoOp(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_SPNoOp; - return 0; -} - -#if defined(F3DEX_GBI_2) -UCFUNC int d_Special3(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_Special3; - argu(m, 0, "hi", getfield(hi, 24, 0), gfxd_Word); - argu(m, 1, "lo", lo, gfxd_Word); - return 0; -} - -UCFUNC int d_Special2(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_Special2; - argu(m, 0, "hi", getfield(hi, 24, 0), gfxd_Word); - argu(m, 1, "lo", lo, gfxd_Word); - return 0; -} - -UCFUNC int d_Special1(gfxd_macro_t *m, uint32_t hi, uint32_t lo) -{ - m->id = gfxd_Special1; - argu(m, 0, "hi", getfield(hi, 24, 0), gfxd_Word); - argu(m, 1, "lo", lo, gfxd_Word); - return 0; -} -#endif diff --git a/ZAPDTR/lib/libgfxd/uc_macrotbl.c b/ZAPDTR/lib/libgfxd/uc_macrotbl.c deleted file mode 100644 index a8939cede..000000000 --- a/ZAPDTR/lib/libgfxd/uc_macrotbl.c +++ /dev/null @@ -1,1397 +0,0 @@ -static const gfxd_macro_type_t macro_tbl[] = -{ - [gfxd_Invalid] = - { - .prefix = NULL, - .suffix = NULL, - .opcode = -1, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_Invalid, - }, - [gfxd_DPFillRectangle] = - { - .prefix = NULL, - .suffix = "DPFillRectangle", - .opcode = G_FILLRECT, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPFillRectangle, - }, - [gfxd_DPFullSync] = - { - .prefix = NULL, - .suffix = "DPFullSync", - .opcode = G_RDPFULLSYNC, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_DPFullSync, - }, - [gfxd_DPLoadSync] = - { - .prefix = NULL, - .suffix = "DPLoadSync", - .opcode = G_RDPLOADSYNC, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_DPLoadSync, - }, - [gfxd_DPTileSync] = - { - .prefix = NULL, - .suffix = "DPTileSync", - .opcode = G_RDPTILESYNC, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_DPTileSync, - }, - [gfxd_DPPipeSync] = - { - .prefix = NULL, - .suffix = "DPPipeSync", - .opcode = G_RDPPIPESYNC, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_DPPipeSync, - }, - [gfxd_DPLoadTLUT_pal16] = - { - .prefix = NULL, - .suffix = "DPLoadTLUT_pal16", - .opcode = G_SETTIMG, - .n_gfx = 6, - .n_arg = 2, - .combine_fn = c_DPLoadTLUT_pal16, - }, - [gfxd_DPLoadTLUT_pal256] = - { - .prefix = NULL, - .suffix = "DPLoadTLUT_pal256", - .opcode = G_SETTIMG, - .n_gfx = 6, - .n_arg = 1, - .combine_fn = c_DPLoadTLUT_pal256, - }, - [gfxd_DPLoadMultiBlockYuvS] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlockYuvS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 14, - .combine_fn = c_DPLoadMultiBlockYuvS, - .ext = 1, - }, - [gfxd_DPLoadMultiBlockYuv] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlockYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 14, - .combine_fn = c_DPLoadMultiBlockYuv, - .ext = 1, - }, - [gfxd_DPLoadMultiBlock_4bS] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlock_4bS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c_DPLoadMultiBlock_4bS, - }, - [gfxd_DPLoadMultiBlock_4b] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlock_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c_DPLoadMultiBlock_4b, - }, - [gfxd_DPLoadMultiBlockS] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlockS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 14, - .combine_fn = c_DPLoadMultiBlockS, - }, - [gfxd_DPLoadMultiBlock] = - { - .prefix = NULL, - .suffix = "DPLoadMultiBlock", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 14, - .combine_fn = c_DPLoadMultiBlock, - }, - [gfxd__DPLoadTextureBlockYuvS] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlockYuvS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c__DPLoadTextureBlockYuvS, - .ext = 1, - }, - [gfxd__DPLoadTextureBlockYuv] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlockYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c__DPLoadTextureBlockYuv, - .ext = 1, - }, - [gfxd__DPLoadTextureBlock_4bS] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlock_4bS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c__DPLoadTextureBlock_4bS, - .ext = 1, - }, - [gfxd__DPLoadTextureBlock_4b] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlock_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c__DPLoadTextureBlock_4b, - }, - [gfxd__DPLoadTextureBlockS] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlockS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c__DPLoadTextureBlockS, - .ext = 1, - }, - [gfxd__DPLoadTextureBlock] = - { - .prefix = "_", - .suffix = "DPLoadTextureBlock", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 13, - .combine_fn = c__DPLoadTextureBlock, - }, - [gfxd_DPLoadTextureBlockYuvS] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlockYuvS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c_DPLoadTextureBlockYuvS, - .ext = 1, - }, - [gfxd_DPLoadTextureBlockYuv] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlockYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c_DPLoadTextureBlockYuv, - .ext = 1, - }, - [gfxd_DPLoadTextureBlock_4bS] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlock_4bS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 11, - .combine_fn = c_DPLoadTextureBlock_4bS, - }, - [gfxd_DPLoadTextureBlock_4b] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlock_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 11, - .combine_fn = c_DPLoadTextureBlock_4b, - }, - [gfxd_DPLoadTextureBlockS] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlockS", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c_DPLoadTextureBlockS, - }, - [gfxd_DPLoadTextureBlock] = - { - .prefix = NULL, - .suffix = "DPLoadTextureBlock", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 12, - .combine_fn = c_DPLoadTextureBlock, - }, - [gfxd_DPLoadMultiTileYuv] = - { - .prefix = NULL, - .suffix = "DPLoadMultiTileYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 18, - .combine_fn = c_DPLoadMultiTileYuv, - .ext = 1, - }, - [gfxd_DPLoadMultiTile_4b] = - { - .prefix = NULL, - .suffix = "DPLoadMultiTile_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 17, - .combine_fn = c_DPLoadMultiTile_4b, - }, - [gfxd_DPLoadMultiTile] = - { - .prefix = NULL, - .suffix = "DPLoadMultiTile", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 18, - .combine_fn = c_DPLoadMultiTile, - }, - [gfxd__DPLoadTextureTileYuv] = - { - .prefix = "_", - .suffix = "DPLoadTextureTileYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 17, - .combine_fn = c__DPLoadTextureTileYuv, - .ext = 1, - }, - [gfxd__DPLoadTextureTile_4b] = - { - .prefix = "_", - .suffix = "DPLoadTextureTile_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 16, - .combine_fn = c__DPLoadTextureTile_4b, - .ext = 1, - }, - [gfxd__DPLoadTextureTile] = - { - .prefix = "_", - .suffix = "DPLoadTextureTile", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 17, - .combine_fn = c__DPLoadTextureTile, - .ext = 1, - }, - [gfxd_DPLoadTextureTileYuv] = - { - .prefix = NULL, - .suffix = "DPLoadTextureTileYuv", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 16, - .combine_fn = c_DPLoadTextureTileYuv, - .ext = 1, - }, - [gfxd_DPLoadTextureTile_4b] = - { - .prefix = NULL, - .suffix = "DPLoadTextureTile_4b", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 15, - .combine_fn = c_DPLoadTextureTile_4b, - }, - [gfxd_DPLoadTextureTile] = - { - .prefix = NULL, - .suffix = "DPLoadTextureTile", - .opcode = G_SETTIMG, - .n_gfx = 7, - .n_arg = 16, - .combine_fn = c_DPLoadTextureTile, - }, - [gfxd_DPLoadBlock] = - { - .prefix = NULL, - .suffix = "DPLoadBlock", - .opcode = G_LOADBLOCK, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_DPLoadBlock, - }, - [gfxd_DPNoOp] = - { - .prefix = NULL, - .suffix = "DPNoOp", - .opcode = G_NOOP, - .n_gfx = 1, - .n_arg = 0, - .alias = gfxd_DPNoOpTag, - }, - [gfxd_DPNoOpTag] = - { - .prefix = NULL, - .suffix = "DPNoOpTag", - .opcode = G_NOOP, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_DPNoOpTag, - }, - [gfxd_DPPipelineMode] = - { - .prefix = NULL, - .suffix = "DPPipelineMode", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetBlendColor] = - { - .prefix = NULL, - .suffix = "DPSetBlendColor", - .opcode = G_SETBLENDCOLOR, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPSetBlendColor, - }, - [gfxd_DPSetEnvColor] = - { - .prefix = NULL, - .suffix = "DPSetEnvColor", - .opcode = G_SETENVCOLOR, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPSetEnvColor, - }, - [gfxd_DPSetFillColor] = - { - .prefix = NULL, - .suffix = "DPSetFillColor", - .opcode = G_SETFILLCOLOR, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_DPSetFillColor, - }, - [gfxd_DPSetFogColor] = - { - .prefix = NULL, - .suffix = "DPSetFogColor", - .opcode = G_SETFOGCOLOR, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPSetFogColor, - }, - [gfxd_DPSetPrimColor] = - { - .prefix = NULL, - .suffix = "DPSetPrimColor", - .opcode = G_SETPRIMCOLOR, - .n_gfx = 1, - .n_arg = 6, - .disas_fn = d_DPSetPrimColor, - }, - [gfxd_DPSetColorImage] = - { - .prefix = NULL, - .suffix = "DPSetColorImage", - .opcode = G_SETCIMG, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPSetColorImage, - }, - [gfxd_DPSetDepthImage] = - { - .prefix = NULL, - .suffix = "DPSetDepthImage", - .opcode = G_SETZIMG, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_DPSetDepthImage, - }, - [gfxd_DPSetTextureImage] = - { - .prefix = NULL, - .suffix = "DPSetTextureImage", - .opcode = G_SETTIMG, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_DPSetTextureImage, - }, - [gfxd_DPSetAlphaCompare] = - { - .prefix = NULL, - .suffix = "DPSetAlphaCompare", - .opcode = G_SETOTHERMODE_L, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeLo, - }, - [gfxd_DPSetAlphaDither] = - { - .prefix = NULL, - .suffix = "DPSetAlphaDither", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetColorDither] = - { - .prefix = NULL, - .suffix = "DPSetColorDither", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetCombineMode] = - { - .prefix = NULL, - .suffix = "DPSetCombineMode", - .opcode = G_SETCOMBINE, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_DPSetCombineLERP, - }, - [gfxd_DPSetCombineLERP] = - { - .prefix = NULL, - .suffix = "DPSetCombineLERP", - .opcode = G_SETCOMBINE, - .n_gfx = 1, - .n_arg = 16, - .disas_fn = d_DPSetCombineLERP, - }, - [gfxd_DPSetConvert] = - { - .prefix = NULL, - .suffix = "DPSetConvert", - .opcode = G_SETCONVERT, - .n_gfx = 1, - .n_arg = 6, - .disas_fn = d_DPSetConvert, - }, - [gfxd_DPSetTextureConvert] = - { - .prefix = NULL, - .suffix = "DPSetTextureConvert", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetCycleType] = - { - .prefix = NULL, - .suffix = "DPSetCycleType", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetDepthSource] = - { - .prefix = NULL, - .suffix = "DPSetDepthSource", - .opcode = G_SETOTHERMODE_L, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeLo, - }, - [gfxd_DPSetCombineKey] = - { - .prefix = NULL, - .suffix = "DPSetCombineKey", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetKeyGB] = - { - .prefix = NULL, - .suffix = "DPSetKeyGB", - .opcode = G_SETKEYGB, - .n_gfx = 1, - .n_arg = 6, - .disas_fn = d_DPSetKeyGB, - }, - [gfxd_DPSetKeyR] = - { - .prefix = NULL, - .suffix = "DPSetKeyR", - .opcode = G_SETKEYR, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_DPSetKeyR, - }, - [gfxd_DPSetPrimDepth] = - { - .prefix = NULL, - .suffix = "DPSetPrimDepth", - .opcode = G_SETPRIMDEPTH, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_DPSetPrimDepth, - }, - [gfxd_DPSetRenderMode] = - { - .prefix = NULL, - .suffix = "DPSetRenderMode", - .opcode = G_SETOTHERMODE_L, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_SPSetOtherModeLo, - }, - [gfxd_DPSetScissor] = - { - .prefix = NULL, - .suffix = "DPSetScissor", - .opcode = G_SETSCISSOR, - .n_gfx = 1, - .n_arg = 5, - .alias = gfxd_DPSetScissorFrac, - }, - [gfxd_DPSetScissorFrac] = - { - .prefix = NULL, - .suffix = "DPSetScissorFrac", - .opcode = G_SETSCISSOR, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_DPSetScissorFrac, - }, - [gfxd_DPSetTextureDetail] = - { - .prefix = NULL, - .suffix = "DPSetTextureDetail", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetTextureFilter] = - { - .prefix = NULL, - .suffix = "DPSetTextureFilter", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetTextureLOD] = - { - .prefix = NULL, - .suffix = "DPSetTextureLOD", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetTextureLUT] = - { - .prefix = NULL, - .suffix = "DPSetTextureLUT", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetTexturePersp] = - { - .prefix = NULL, - .suffix = "DPSetTexturePersp", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPSetOtherModeHi, - }, - [gfxd_DPSetTile] = - { - .prefix = NULL, - .suffix = "DPSetTile", - .opcode = G_SETTILE, - .n_gfx = 1, - .n_arg = 12, - .disas_fn = d_DPSetTile, - }, - [gfxd_DPSetTileSize] = - { - .prefix = NULL, - .suffix = "DPSetTileSize", - .opcode = G_SETTILESIZE, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_DPSetTileSize, - }, - [gfxd_SP1Triangle] = - { - .prefix = NULL, - .suffix = "SP1Triangle", - .opcode = G_TRI1, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_SP1Triangle, - }, -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_SP2Triangles] = - { - .prefix = NULL, - .suffix = "SP2Triangles", - .opcode = G_TRI2, - .n_gfx = 1, - .n_arg = 8, - .disas_fn = d_SP2Triangles, - }, -#endif -#if defined(F3DEX_GBI) - [gfxd_SP1Quadrangle] = - { - .prefix = NULL, - .suffix = "SP1Quadrangle", - .opcode = G_TRI2, - .n_gfx = 1, - .n_arg = 5, - .alias = gfxd_SP2Triangles, - }, -#elif defined(F3DEX_GBI_2) - [gfxd_SP1Quadrangle] = - { - .prefix = NULL, - .suffix = "SP1Quadrangle", - .opcode = G_QUAD, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_SP1Quadrangle, - }, -#endif -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_SPBranchLessZraw] = - { - .prefix = NULL, - .suffix = "SPBranchLessZraw", - .opcode = G_RDPHALF_1, - .n_gfx = 2, - .n_arg = 3, - .combine_fn = c_SPBranchLessZraw, - }, -#endif - [gfxd_SPBranchList] = - { - .prefix = NULL, - .suffix = "SPBranchList", - .opcode = G_DL, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_DisplayList, - }, - [gfxd_SPClipRatio] = - { - .prefix = NULL, - .suffix = "SPClipRatio", - .opcode = G_MOVEWORD, - .n_gfx = 4, - .n_arg = 1, - .combine_fn = c_SPClipRatio, - }, - [gfxd_SPCullDisplayList] = - { - .prefix = NULL, - .suffix = "SPCullDisplayList", - .opcode = G_CULLDL, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_SPCullDisplayList, - }, - [gfxd_SPDisplayList] = - { - .prefix = NULL, - .suffix = "SPDisplayList", - .opcode = G_DL, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_DisplayList, - }, - [gfxd_SPEndDisplayList] = - { - .prefix = NULL, - .suffix = "SPEndDisplayList", - .opcode = G_ENDDL, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_SPEndDisplayList, - }, - [gfxd_SPFogFactor] = - { - .prefix = NULL, - .suffix = "SPFogFactor", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_SPFogPosition, - }, - [gfxd_SPFogPosition] = - { - .prefix = NULL, - .suffix = "SPFogPosition", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_MoveWd, - }, -#if defined(F3D_GBI) || defined(F3DEX_GBI) - [gfxd_SPForceMatrix] = - { - .prefix = NULL, - .suffix = "SPForceMatrix", - .opcode = G_MOVEMEM, - .n_gfx = 4, - .n_arg = 1, - .combine_fn = c_SPForceMatrix, - }, - [gfxd_SPSetGeometryMode] = - { - .prefix = NULL, - .suffix = "SPSetGeometryMode", - .opcode = G_SETGEOMETRYMODE, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_SPSetGeometryMode, - }, - [gfxd_SPClearGeometryMode] = - { - .prefix = NULL, - .suffix = "SPClearGeometryMode", - .opcode = G_CLEARGEOMETRYMODE, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_SPClearGeometryMode, - }, - [gfxd_SPLoadGeometryMode] = - { - .prefix = NULL, - .suffix = "SPLoadGeometryMode", - .opcode = G_CLEARGEOMETRYMODE, - .n_gfx = 2, - .n_arg = 1, - .combine_fn = c_SPLoadGeometryMode, - }, -#elif defined(F3DEX_GBI_2) - [gfxd_SPForceMatrix] = - { - .prefix = NULL, - .suffix = "SPForceMatrix", - .opcode = G_MOVEMEM, - .n_gfx = 2, - .n_arg = 1, - .combine_fn = c_SPForceMatrix, - }, - [gfxd_SPSetGeometryMode] = - { - .prefix = NULL, - .suffix = "SPSetGeometryMode", - .opcode = G_GEOMETRYMODE, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPGeometryMode, - }, - [gfxd_SPClearGeometryMode] = - { - .prefix = NULL, - .suffix = "SPClearGeometryMode", - .opcode = G_GEOMETRYMODE, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPGeometryMode, - }, - [gfxd_SPLoadGeometryMode] = - { - .prefix = NULL, - .suffix = "SPLoadGeometryMode", - .opcode = G_GEOMETRYMODE, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPGeometryMode, - }, -#endif -#if defined(F3D_GBI) || defined(F3DEX_GBI) - [gfxd_SPInsertMatrix] = - { - .prefix = NULL, - .suffix = "SPInsertMatrix", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_MoveWd, - }, -#endif - [gfxd_SPLine3D] = - { - .prefix = NULL, - .suffix = "SPLine3D", - .opcode = G_LINE3D, - .n_gfx = 1, - .n_arg = 3, - .alias = gfxd_SPLineW3D, - }, - [gfxd_SPLineW3D] = - { - .prefix = NULL, - .suffix = "SPLineW3D", - .opcode = G_LINE3D, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_SPLineW3D, - }, -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_SPLoadUcode] = - { - .prefix = NULL, - .suffix = "SPLoadUcode", - .opcode = G_RDPHALF_1, - .n_gfx = 2, - .n_arg = 2, - .combine_fn = c_SPLoadUcode, - }, -#endif - [gfxd_SPLookAtX] = - { - .prefix = NULL, - .suffix = "SPLookAtX", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_MoveMem, - }, - [gfxd_SPLookAtY] = - { - .prefix = NULL, - .suffix = "SPLookAtY", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_MoveMem, - }, - [gfxd_SPLookAt] = - { - .prefix = NULL, - .suffix = "SPLookAt", - .opcode = G_MOVEMEM, - .n_gfx = 2, - .n_arg = 1, - .combine_fn = c_SPLookAt, - }, - [gfxd_SPMatrix] = - { - .prefix = NULL, - .suffix = "SPMatrix", - .opcode = G_MTX, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_SPMatrix, - }, -#if defined(F3D_GBI) || (defined(F3D_BETA) && defined(F3DEX_GBI)) - [gfxd_SPModifyVertex] = - { - .prefix = NULL, - .suffix = "SPModifyVertex", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 3, - .alias = gfxd_MoveWd, - }, -#elif defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_SPModifyVertex] = - { - .prefix = NULL, - .suffix = "SPModifyVertex", - .opcode = G_MODIFYVTX, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_SPModifyVertex, - }, -#endif -#if defined(F3D_BETA) && (defined(F3D_GBI) || defined(F3DEX_GBI)) - [gfxd_SPPerspNormalize] = - { - .prefix = NULL, - .suffix = "SPPerspNormalize", - .opcode = G_PERSPNORM, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_SPPerspNormalize, - }, -#else - [gfxd_SPPerspNormalize] = - { - .prefix = NULL, - .suffix = "SPPerspNormalize", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_MoveWd, - }, -#endif -#if defined(F3D_GBI) || defined(F3DEX_GBI) - [gfxd_SPPopMatrix] = - { - .prefix = NULL, - .suffix = "SPPopMatrix", - .opcode = G_POPMTX, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_SPPopMatrix, - }, -#elif defined(F3DEX_GBI_2) - [gfxd_SPPopMatrix] = - { - .prefix = NULL, - .suffix = "SPPopMatrix", - .opcode = G_POPMTX, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_SPPopMatrixN, - }, - [gfxd_SPPopMatrixN] = - { - .prefix = NULL, - .suffix = "SPPopMatrixN", - .opcode = G_POPMTX, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_SPPopMatrixN, - }, -#endif - [gfxd_SPSegment] = - { - .prefix = NULL, - .suffix = "SPSegment", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_MoveWd, - }, - [gfxd_SPSetLights1] = - { - .prefix = NULL, - .suffix = "SPSetLights1", - .opcode = G_MOVEWORD, - .n_gfx = 3, - .n_arg = 1, - .combine_fn = c_SPSetLights1, - }, - [gfxd_SPSetLights2] = - { - .prefix = NULL, - .suffix = "SPSetLights2", - .opcode = G_MOVEWORD, - .n_gfx = 4, - .n_arg = 1, - .combine_fn = c_SPSetLights2, - }, - [gfxd_SPSetLights3] = - { - .prefix = NULL, - .suffix = "SPSetLights3", - .opcode = G_MOVEWORD, - .n_gfx = 5, - .n_arg = 1, - .combine_fn = c_SPSetLights3, - }, - [gfxd_SPSetLights4] = - { - .prefix = NULL, - .suffix = "SPSetLights4", - .opcode = G_MOVEWORD, - .n_gfx = 6, - .n_arg = 1, - .combine_fn = c_SPSetLights4, - }, - [gfxd_SPSetLights5] = - { - .prefix = NULL, - .suffix = "SPSetLights5", - .opcode = G_MOVEWORD, - .n_gfx = 7, - .n_arg = 1, - .combine_fn = c_SPSetLights5, - }, - [gfxd_SPSetLights6] = - { - .prefix = NULL, - .suffix = "SPSetLights6", - .opcode = G_MOVEWORD, - .n_gfx = 8, - .n_arg = 1, - .combine_fn = c_SPSetLights6, - }, - [gfxd_SPSetLights7] = - { - .prefix = NULL, - .suffix = "SPSetLights7", - .opcode = G_MOVEWORD, - .n_gfx = 9, - .n_arg = 1, - .combine_fn = c_SPSetLights7, - }, - [gfxd_SPNumLights] = - { - .prefix = NULL, - .suffix = "SPNumLights", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_MoveWd, - }, - [gfxd_SPLight] = - { - .prefix = NULL, - .suffix = "SPLight", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 2, - .alias = gfxd_MoveMem, - }, - [gfxd_SPLightColor] = - { - .prefix = NULL, - .suffix = "SPLightColor", - .opcode = G_MOVEWORD, - .n_gfx = 2, - .n_arg = 2, - .combine_fn = c_SPLightColor, - }, - [gfxd_SPTexture] = - { - .prefix = NULL, - .suffix = "SPTexture", - .opcode = G_TEXTURE, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_SPTexture, - }, - [gfxd_SPTextureRectangle] = - { - .prefix = NULL, - .suffix = "SPTextureRectangle", - .opcode = G_TEXRECT, - .n_gfx = 3, - .n_arg = 9, - .combine_fn = c_SPTextureRectangle, - }, - [gfxd_SPTextureRectangleFlip] = - { - .prefix = NULL, - .suffix = "SPTextureRectangleFlip", - .opcode = G_TEXRECTFLIP, - .n_gfx = 3, - .n_arg = 9, - .combine_fn = c_SPTextureRectangleFlip, - }, - [gfxd_SPVertex] = - { - .prefix = NULL, - .suffix = "SPVertex", - .opcode = G_VTX, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_SPVertex, - }, - [gfxd_SPViewport] = - { - .prefix = NULL, - .suffix = "SPViewport", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 1, - .alias = gfxd_MoveMem, - }, - [gfxd_DPLoadTLUTCmd] = - { - .prefix = NULL, - .suffix = "DPLoadTLUTCmd", - .opcode = G_LOADTLUT, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_DPLoadTLUTCmd, - }, - [gfxd_DPLoadTLUT] = - { - .prefix = NULL, - .suffix = "DPLoadTLUT", - .opcode = G_SETTIMG, - .n_gfx = 6, - .n_arg = 3, - .combine_fn = c_DPLoadTLUT, - }, -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_BranchZ] = - { - .prefix = NULL, - .suffix = "BranchZ", - .opcode = G_BRANCH_Z, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_BranchZ, - .ext = 1, - }, -#endif - [gfxd_DisplayList] = - { - .prefix = NULL, - .suffix = "DisplayList", - .opcode = G_DL, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_DisplayList, - .ext = 1, - }, - [gfxd_DPHalf1] = - { - .prefix = NULL, - .suffix = "DPHalf1", - .opcode = G_RDPHALF_1, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_DPHalf1, - .ext = 1, - }, - [gfxd_DPHalf2] = - { - .prefix = NULL, - .suffix = "DPHalf2", - .opcode = G_RDPHALF_2, - .n_gfx = 1, - .n_arg = 1, - .disas_fn = d_DPHalf2, - .ext = 1, - }, - [gfxd_DPWord] = - { - .prefix = NULL, - .suffix = "DPWord", - .opcode = G_RDPHALF_1, - .n_gfx = 2, - .n_arg = 2, - .combine_fn = c_DPWord, - }, - [gfxd_DPLoadTile] = - { - .prefix = NULL, - .suffix = "DPLoadTile", - .opcode = G_LOADTILE, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_DPLoadTile, - }, -#if defined(F3DEX_GBI_2) - [gfxd_SPGeometryMode] = - { - .prefix = NULL, - .suffix = "SPGeometryMode", - .opcode = G_GEOMETRYMODE, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_SPGeometryMode, - }, -#endif - [gfxd_SPSetOtherMode] = - { - .prefix = NULL, - .suffix = "SPSetOtherMode", - .opcode = -1, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_SPSetOtherMode, - }, - [gfxd_SPSetOtherModeLo] = - { - .prefix = NULL, - .suffix = "SPSetOtherModeLo", - .opcode = G_SETOTHERMODE_L, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_SPSetOtherModeLo, - .ext = 1, - }, - [gfxd_SPSetOtherModeHi] = - { - .prefix = NULL, - .suffix = "SPSetOtherModeHi", - .opcode = G_SETOTHERMODE_H, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_SPSetOtherModeHi, - .ext = 1, - }, - [gfxd_DPSetOtherMode] = - { - .prefix = NULL, - .suffix = "DPSetOtherMode", - .opcode = G_RDPSETOTHERMODE, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_DPSetOtherMode, - }, - [gfxd_MoveWd] = - { - .prefix = NULL, - .suffix = "MoveWd", - .opcode = G_MOVEWORD, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_MoveWd, - }, -#if defined(F3D_GBI) || defined(F3DEX_GBI) - [gfxd_MoveMem] = - { - .prefix = NULL, - .suffix = "MoveMem", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 3, - .disas_fn = d_MoveMem, - .ext = 1, - }, -#elif defined(F3DEX_GBI_2) - [gfxd_MoveMem] = - { - .prefix = NULL, - .suffix = "MoveMem", - .opcode = G_MOVEMEM, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_MoveMem, - .ext = 1, - }, -#endif -#if defined(F3DEX_GBI_2) - [gfxd_SPDma_io] = - { - .prefix = NULL, - .suffix = "SPDma_io", - .opcode = G_DMA_IO, - .n_gfx = 1, - .n_arg = 4, - .disas_fn = d_SPDma_io, - }, - [gfxd_SPDmaRead] = - { - .prefix = NULL, - .suffix = "SPDmaRead", - .opcode = G_DMA_IO, - .n_gfx = 1, - .n_arg = 3, - .alias = gfxd_SPDma_io, - }, - [gfxd_SPDmaWrite] = - { - .prefix = NULL, - .suffix = "SPDmaWrite", - .opcode = G_DMA_IO, - .n_gfx = 1, - .n_arg = 3, - .alias = gfxd_SPDma_io, - }, -#endif -#if defined(F3DEX_GBI) || defined(F3DEX_GBI_2) - [gfxd_LoadUcode] = - { - .prefix = NULL, - .suffix = "LoadUcode", - .opcode = G_LOAD_UCODE, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_LoadUcode, - }, - [gfxd_SPLoadUcodeEx] = - { - .prefix = NULL, - .suffix = "SPLoadUcodeEx", - .opcode = G_RDPHALF_1, - .n_gfx = 2, - .n_arg = 3, - .combine_fn = c_SPLoadUcodeEx, - }, -#endif - [gfxd_TexRect] = - { - .prefix = NULL, - .suffix = "TexRect", - .opcode = G_TEXRECT, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_TexRect, - .ext = 1, - }, - [gfxd_TexRectFlip] = - { - .prefix = NULL, - .suffix = "TexRectFlip", - .opcode = G_TEXRECTFLIP, - .n_gfx = 1, - .n_arg = 5, - .disas_fn = d_TexRectFlip, - .ext = 1, - }, - [gfxd_SPNoOp] = - { - .prefix = NULL, - .suffix = "SPNoOp", - .opcode = G_SPNOOP, - .n_gfx = 1, - .n_arg = 0, - .disas_fn = d_SPNoOp, - }, -#if defined(F3DEX_GBI_2) - [gfxd_Special3] = - { - .prefix = NULL, - .suffix = "Special3", - .opcode = G_SPECIAL_3, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_Special3, - .ext = 1, - }, - [gfxd_Special2] = - { - .prefix = NULL, - .suffix = "Special2", - .opcode = G_SPECIAL_2, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_Special2, - .ext = 1, - }, - [gfxd_Special1] = - { - .prefix = NULL, - .suffix = "Special1", - .opcode = G_SPECIAL_1, - .n_gfx = 1, - .n_arg = 2, - .disas_fn = d_Special1, - .ext = 1, - }, -#endif -}; diff --git a/ZAPDTR/lib/tinyxml2/tinyxml2.cpp b/ZAPDTR/lib/tinyxml2/tinyxml2.cpp deleted file mode 100644 index 23a3a6ce4..000000000 --- a/ZAPDTR/lib/tinyxml2/tinyxml2.cpp +++ /dev/null @@ -1,2837 +0,0 @@ -/* -Original code by Lee Thomason (www.grinninglizard.com) - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any -damages arising from the use of this software. - -Permission is granted to anyone to use this software for any -purpose, including commercial applications, and to alter it and -redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must -not claim that you wrote the original software. If you use this -software in a product, an acknowledgment in the product documentation -would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and -must not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source -distribution. -*/ - -#include "tinyxml2.h" - -#include // yes, this one new style header, is in the Android SDK. -#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) -# include -# include -#else -# include -# include -#endif - -#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE) - // Microsoft Visual Studio, version 2005 and higher. Not WinCE. - /*int _snprintf_s( - char *buffer, - size_t sizeOfBuffer, - size_t count, - const char *format [, - argument] ... - );*/ - static inline int TIXML_SNPRINTF( char* buffer, size_t size, const char* format, ... ) - { - va_list va; - va_start( va, format ); - int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va ); - va_end( va ); - return result; - } - - static inline int TIXML_VSNPRINTF( char* buffer, size_t size, const char* format, va_list va ) - { - int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va ); - return result; - } - - #define TIXML_VSCPRINTF _vscprintf - #define TIXML_SSCANF sscanf_s -#elif defined _MSC_VER - // Microsoft Visual Studio 2003 and earlier or WinCE - #define TIXML_SNPRINTF _snprintf - #define TIXML_VSNPRINTF _vsnprintf - #define TIXML_SSCANF sscanf - #if (_MSC_VER < 1400 ) && (!defined WINCE) - // Microsoft Visual Studio 2003 and not WinCE. - #define TIXML_VSCPRINTF _vscprintf // VS2003's C runtime has this, but VC6 C runtime or WinCE SDK doesn't have. - #else - // Microsoft Visual Studio 2003 and earlier or WinCE. - static inline int TIXML_VSCPRINTF( const char* format, va_list va ) - { - int len = 512; - for (;;) { - len = len*2; - char* str = new char[len](); - const int required = _vsnprintf(str, len, format, va); - delete[] str; - if ( required != -1 ) { - TIXMLASSERT( required >= 0 ); - len = required; - break; - } - } - TIXMLASSERT( len >= 0 ); - return len; - } - #endif -#else - // GCC version 3 and higher - //#warning( "Using sn* functions." ) - #define TIXML_SNPRINTF snprintf - #define TIXML_VSNPRINTF vsnprintf - static inline int TIXML_VSCPRINTF( const char* format, va_list va ) - { - int len = vsnprintf( 0, 0, format, va ); - TIXMLASSERT( len >= 0 ); - return len; - } - #define TIXML_SSCANF sscanf -#endif - - -static const char LINE_FEED = (char)0x0a; // all line endings are normalized to LF -static const char LF = LINE_FEED; -static const char CARRIAGE_RETURN = (char)0x0d; // CR gets filtered out -static const char CR = CARRIAGE_RETURN; -static const char SINGLE_QUOTE = '\''; -static const char DOUBLE_QUOTE = '\"'; - -// Bunch of unicode info at: -// http://www.unicode.org/faq/utf_bom.html -// ef bb bf (Microsoft "lead bytes") - designates UTF-8 - -static const unsigned char TIXML_UTF_LEAD_0 = 0xefU; -static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU; -static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU; - -namespace tinyxml2 -{ - -struct Entity { - const char* pattern; - int length; - char value; -}; - -static const int NUM_ENTITIES = 5; -static const Entity entities[NUM_ENTITIES] = { - { "quot", 4, DOUBLE_QUOTE }, - { "amp", 3, '&' }, - { "apos", 4, SINGLE_QUOTE }, - { "lt", 2, '<' }, - { "gt", 2, '>' } -}; - - -StrPair::~StrPair() -{ - Reset(); -} - - -void StrPair::TransferTo( StrPair* other ) -{ - if ( this == other ) { - return; - } - // This in effect implements the assignment operator by "moving" - // ownership (as in auto_ptr). - - TIXMLASSERT( other != 0 ); - TIXMLASSERT( other->_flags == 0 ); - TIXMLASSERT( other->_start == 0 ); - TIXMLASSERT( other->_end == 0 ); - - other->Reset(); - - other->_flags = _flags; - other->_start = _start; - other->_end = _end; - - _flags = 0; - _start = 0; - _end = 0; -} - - -void StrPair::Reset() -{ - if ( _flags & NEEDS_DELETE ) { - delete [] _start; - } - _flags = 0; - _start = 0; - _end = 0; -} - - -void StrPair::SetStr( const char* str, int flags ) -{ - TIXMLASSERT( str ); - Reset(); - size_t len = strlen( str ); - TIXMLASSERT( _start == 0 ); - _start = new char[ len+1 ]; - memcpy( _start, str, len+1 ); - _end = _start + len; - _flags = flags | NEEDS_DELETE; -} - - -char* StrPair::ParseText( char* p, const char* endTag, int strFlags, int* curLineNumPtr ) -{ - TIXMLASSERT( p ); - TIXMLASSERT( endTag && *endTag ); - TIXMLASSERT(curLineNumPtr); - - char* start = p; - char endChar = *endTag; - size_t length = strlen( endTag ); - - // Inner loop of text parsing. - while ( *p ) { - if ( *p == endChar && strncmp( p, endTag, length ) == 0 ) { - Set( start, p, strFlags ); - return p + length; - } else if (*p == '\n') { - ++(*curLineNumPtr); - } - ++p; - TIXMLASSERT( p ); - } - return 0; -} - - -char* StrPair::ParseName( char* p ) -{ - if ( !p || !(*p) ) { - return 0; - } - if ( !XMLUtil::IsNameStartChar( *p ) ) { - return 0; - } - - char* const start = p; - ++p; - while ( *p && XMLUtil::IsNameChar( *p ) ) { - ++p; - } - - Set( start, p, 0 ); - return p; -} - - -void StrPair::CollapseWhitespace() -{ - // Adjusting _start would cause undefined behavior on delete[] - TIXMLASSERT( ( _flags & NEEDS_DELETE ) == 0 ); - // Trim leading space. - _start = XMLUtil::SkipWhiteSpace( _start, 0 ); - - if ( *_start ) { - const char* p = _start; // the read pointer - char* q = _start; // the write pointer - - while( *p ) { - if ( XMLUtil::IsWhiteSpace( *p )) { - p = XMLUtil::SkipWhiteSpace( p, 0 ); - if ( *p == 0 ) { - break; // don't write to q; this trims the trailing space. - } - *q = ' '; - ++q; - } - *q = *p; - ++q; - ++p; - } - *q = 0; - } -} - - -const char* StrPair::GetStr() -{ - TIXMLASSERT( _start ); - TIXMLASSERT( _end ); - if ( _flags & NEEDS_FLUSH ) { - *_end = 0; - _flags ^= NEEDS_FLUSH; - - if ( _flags ) { - const char* p = _start; // the read pointer - char* q = _start; // the write pointer - - while( p < _end ) { - if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == CR ) { - // CR-LF pair becomes LF - // CR alone becomes LF - // LF-CR becomes LF - if ( *(p+1) == LF ) { - p += 2; - } - else { - ++p; - } - *q = LF; - ++q; - } - else if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == LF ) { - if ( *(p+1) == CR ) { - p += 2; - } - else { - ++p; - } - *q = LF; - ++q; - } - else if ( (_flags & NEEDS_ENTITY_PROCESSING) && *p == '&' ) { - // Entities handled by tinyXML2: - // - special entities in the entity table [in/out] - // - numeric character reference [in] - // 中 or 中 - - if ( *(p+1) == '#' ) { - const int buflen = 10; - char buf[buflen] = { 0 }; - int len = 0; - char* adjusted = const_cast( XMLUtil::GetCharacterRef( p, buf, &len ) ); - if ( adjusted == 0 ) { - *q = *p; - ++p; - ++q; - } - else { - TIXMLASSERT( 0 <= len && len <= buflen ); - TIXMLASSERT( q + len <= adjusted ); - p = adjusted; - memcpy( q, buf, len ); - q += len; - } - } - else { - bool entityFound = false; - for( int i = 0; i < NUM_ENTITIES; ++i ) { - const Entity& entity = entities[i]; - if ( strncmp( p + 1, entity.pattern, entity.length ) == 0 - && *( p + entity.length + 1 ) == ';' ) { - // Found an entity - convert. - *q = entity.value; - ++q; - p += entity.length + 2; - entityFound = true; - break; - } - } - if ( !entityFound ) { - // fixme: treat as error? - ++p; - ++q; - } - } - } - else { - *q = *p; - ++p; - ++q; - } - } - *q = 0; - } - // The loop below has plenty going on, and this - // is a less useful mode. Break it out. - if ( _flags & NEEDS_WHITESPACE_COLLAPSING ) { - CollapseWhitespace(); - } - _flags = (_flags & NEEDS_DELETE); - } - TIXMLASSERT( _start ); - return _start; -} - - - - -// --------- XMLUtil ----------- // - -const char* XMLUtil::writeBoolTrue = "true"; -const char* XMLUtil::writeBoolFalse = "false"; - -void XMLUtil::SetBoolSerialization(const char* writeTrue, const char* writeFalse) -{ - static const char* defTrue = "true"; - static const char* defFalse = "false"; - - writeBoolTrue = (writeTrue) ? writeTrue : defTrue; - writeBoolFalse = (writeFalse) ? writeFalse : defFalse; -} - - -const char* XMLUtil::ReadBOM( const char* p, bool* bom ) -{ - TIXMLASSERT( p ); - TIXMLASSERT( bom ); - *bom = false; - const unsigned char* pu = reinterpret_cast(p); - // Check for BOM: - if ( *(pu+0) == TIXML_UTF_LEAD_0 - && *(pu+1) == TIXML_UTF_LEAD_1 - && *(pu+2) == TIXML_UTF_LEAD_2 ) { - *bom = true; - p += 3; - } - TIXMLASSERT( p ); - return p; -} - - -void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length ) -{ - const unsigned long BYTE_MASK = 0xBF; - const unsigned long BYTE_MARK = 0x80; - const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC }; - - if (input < 0x80) { - *length = 1; - } - else if ( input < 0x800 ) { - *length = 2; - } - else if ( input < 0x10000 ) { - *length = 3; - } - else if ( input < 0x200000 ) { - *length = 4; - } - else { - *length = 0; // This code won't convert this correctly anyway. - return; - } - - output += *length; - - // Scary scary fall throughs are annotated with carefully designed comments - // to suppress compiler warnings such as -Wimplicit-fallthrough in gcc - switch (*length) { - case 4: - --output; - *output = (char)((input | BYTE_MARK) & BYTE_MASK); - input >>= 6; - //fall through - case 3: - --output; - *output = (char)((input | BYTE_MARK) & BYTE_MASK); - input >>= 6; - //fall through - case 2: - --output; - *output = (char)((input | BYTE_MARK) & BYTE_MASK); - input >>= 6; - //fall through - case 1: - --output; - *output = (char)(input | FIRST_BYTE_MARK[*length]); - break; - default: - TIXMLASSERT( false ); - } -} - - -const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length ) -{ - // Presume an entity, and pull it out. - *length = 0; - - if ( *(p+1) == '#' && *(p+2) ) { - unsigned long ucs = 0; - TIXMLASSERT( sizeof( ucs ) >= 4 ); - ptrdiff_t delta = 0; - unsigned mult = 1; - static const char SEMICOLON = ';'; - - if ( *(p+2) == 'x' ) { - // Hexadecimal. - const char* q = p+3; - if ( !(*q) ) { - return 0; - } - - q = strchr( q, SEMICOLON ); - - if ( !q ) { - return 0; - } - TIXMLASSERT( *q == SEMICOLON ); - - delta = q-p; - --q; - - while ( *q != 'x' ) { - unsigned int digit = 0; - - if ( *q >= '0' && *q <= '9' ) { - digit = *q - '0'; - } - else if ( *q >= 'a' && *q <= 'f' ) { - digit = *q - 'a' + 10; - } - else if ( *q >= 'A' && *q <= 'F' ) { - digit = *q - 'A' + 10; - } - else { - return 0; - } - TIXMLASSERT( digit < 16 ); - TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit ); - const unsigned int digitScaled = mult * digit; - TIXMLASSERT( ucs <= ULONG_MAX - digitScaled ); - ucs += digitScaled; - TIXMLASSERT( mult <= UINT_MAX / 16 ); - mult *= 16; - --q; - } - } - else { - // Decimal. - const char* q = p+2; - if ( !(*q) ) { - return 0; - } - - q = strchr( q, SEMICOLON ); - - if ( !q ) { - return 0; - } - TIXMLASSERT( *q == SEMICOLON ); - - delta = q-p; - --q; - - while ( *q != '#' ) { - if ( *q >= '0' && *q <= '9' ) { - const unsigned int digit = *q - '0'; - TIXMLASSERT( digit < 10 ); - TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit ); - const unsigned int digitScaled = mult * digit; - TIXMLASSERT( ucs <= ULONG_MAX - digitScaled ); - ucs += digitScaled; - } - else { - return 0; - } - TIXMLASSERT( mult <= UINT_MAX / 10 ); - mult *= 10; - --q; - } - } - // convert the UCS to UTF-8 - ConvertUTF32ToUTF8( ucs, value, length ); - return p + delta + 1; - } - return p+1; -} - - -void XMLUtil::ToStr( int v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%d", v ); -} - - -void XMLUtil::ToStr( unsigned v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%u", v ); -} - - -void XMLUtil::ToStr( bool v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%s", v ? writeBoolTrue : writeBoolFalse); -} - -/* - ToStr() of a number is a very tricky topic. - https://github.com/leethomason/tinyxml2/issues/106 -*/ -void XMLUtil::ToStr( float v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%.8g", v ); -} - - -void XMLUtil::ToStr( double v, char* buffer, int bufferSize ) -{ - TIXML_SNPRINTF( buffer, bufferSize, "%.17g", v ); -} - - -void XMLUtil::ToStr(int64_t v, char* buffer, int bufferSize) -{ - // horrible syntax trick to make the compiler happy about %lld - TIXML_SNPRINTF(buffer, bufferSize, "%lld", (long long)v); -} - - -bool XMLUtil::ToInt( const char* str, int* value ) -{ - if ( TIXML_SSCANF( str, "%d", value ) == 1 ) { - return true; - } - return false; -} - -bool XMLUtil::ToUnsigned( const char* str, unsigned *value ) -{ - if ( TIXML_SSCANF( str, "%u", value ) == 1 ) { - return true; - } - return false; -} - -bool XMLUtil::ToBool( const char* str, bool* value ) -{ - int ival = 0; - if ( ToInt( str, &ival )) { - *value = (ival==0) ? false : true; - return true; - } - if ( StringEqual( str, "true" ) ) { - *value = true; - return true; - } - else if ( StringEqual( str, "false" ) ) { - *value = false; - return true; - } - return false; -} - - -bool XMLUtil::ToFloat( const char* str, float* value ) -{ - if ( TIXML_SSCANF( str, "%f", value ) == 1 ) { - return true; - } - return false; -} - - -bool XMLUtil::ToDouble( const char* str, double* value ) -{ - if ( TIXML_SSCANF( str, "%lf", value ) == 1 ) { - return true; - } - return false; -} - - -bool XMLUtil::ToInt64(const char* str, int64_t* value) -{ - long long v = 0; // horrible syntax trick to make the compiler happy about %lld - if (TIXML_SSCANF(str, "%lld", &v) == 1) { - *value = (int64_t)v; - return true; - } - return false; -} - - -char* XMLDocument::Identify( char* p, XMLNode** node ) -{ - TIXMLASSERT( node ); - TIXMLASSERT( p ); - char* const start = p; - int const startLine = _parseCurLineNum; - p = XMLUtil::SkipWhiteSpace( p, &_parseCurLineNum ); - if( !*p ) { - *node = 0; - TIXMLASSERT( p ); - return p; - } - - // These strings define the matching patterns: - static const char* xmlHeader = { "( _commentPool ); - returnNode->_parseLineNum = _parseCurLineNum; - p += xmlHeaderLen; - } - else if ( XMLUtil::StringEqual( p, commentHeader, commentHeaderLen ) ) { - returnNode = CreateUnlinkedNode( _commentPool ); - returnNode->_parseLineNum = _parseCurLineNum; - p += commentHeaderLen; - } - else if ( XMLUtil::StringEqual( p, cdataHeader, cdataHeaderLen ) ) { - XMLText* text = CreateUnlinkedNode( _textPool ); - returnNode = text; - returnNode->_parseLineNum = _parseCurLineNum; - p += cdataHeaderLen; - text->SetCData( true ); - } - else if ( XMLUtil::StringEqual( p, dtdHeader, dtdHeaderLen ) ) { - returnNode = CreateUnlinkedNode( _commentPool ); - returnNode->_parseLineNum = _parseCurLineNum; - p += dtdHeaderLen; - } - else if ( XMLUtil::StringEqual( p, elementHeader, elementHeaderLen ) ) { - returnNode = CreateUnlinkedNode( _elementPool ); - returnNode->_parseLineNum = _parseCurLineNum; - p += elementHeaderLen; - } - else { - returnNode = CreateUnlinkedNode( _textPool ); - returnNode->_parseLineNum = _parseCurLineNum; // Report line of first non-whitespace character - p = start; // Back it up, all the text counts. - _parseCurLineNum = startLine; - } - - TIXMLASSERT( returnNode ); - TIXMLASSERT( p ); - *node = returnNode; - return p; -} - - -bool XMLDocument::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - if ( visitor->VisitEnter( *this ) ) { - for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) { - if ( !node->Accept( visitor ) ) { - break; - } - } - } - return visitor->VisitExit( *this ); -} - - -// --------- XMLNode ----------- // - -XMLNode::XMLNode( XMLDocument* doc ) : - _document( doc ), - _parent( 0 ), - _value(), - _parseLineNum( 0 ), - _firstChild( 0 ), _lastChild( 0 ), - _prev( 0 ), _next( 0 ), - _userData( 0 ), - _memPool( 0 ) -{ -} - - -XMLNode::~XMLNode() -{ - DeleteChildren(); - if ( _parent ) { - _parent->Unlink( this ); - } -} - -const char* XMLNode::Value() const -{ - // Edge case: XMLDocuments don't have a Value. Return null. - if ( this->ToDocument() ) - return 0; - return _value.GetStr(); -} - -void XMLNode::SetValue( const char* str, bool staticMem ) -{ - if ( staticMem ) { - _value.SetInternedStr( str ); - } - else { - _value.SetStr( str ); - } -} - -XMLNode* XMLNode::DeepClone(XMLDocument* target) const -{ - XMLNode* clone = this->ShallowClone(target); - if (!clone) return 0; - - for (const XMLNode* child = this->FirstChild(); child; child = child->NextSibling()) { - XMLNode* childClone = child->DeepClone(target); - TIXMLASSERT(childClone); - clone->InsertEndChild(childClone); - } - return clone; -} - -void XMLNode::DeleteChildren() -{ - while( _firstChild ) { - TIXMLASSERT( _lastChild ); - DeleteChild( _firstChild ); - } - _firstChild = _lastChild = 0; -} - - -void XMLNode::Unlink( XMLNode* child ) -{ - TIXMLASSERT( child ); - TIXMLASSERT( child->_document == _document ); - TIXMLASSERT( child->_parent == this ); - if ( child == _firstChild ) { - _firstChild = _firstChild->_next; - } - if ( child == _lastChild ) { - _lastChild = _lastChild->_prev; - } - - if ( child->_prev ) { - child->_prev->_next = child->_next; - } - if ( child->_next ) { - child->_next->_prev = child->_prev; - } - child->_next = 0; - child->_prev = 0; - child->_parent = 0; -} - - -void XMLNode::DeleteChild( XMLNode* node ) -{ - TIXMLASSERT( node ); - TIXMLASSERT( node->_document == _document ); - TIXMLASSERT( node->_parent == this ); - Unlink( node ); - TIXMLASSERT(node->_prev == 0); - TIXMLASSERT(node->_next == 0); - TIXMLASSERT(node->_parent == 0); - DeleteNode( node ); -} - - -XMLNode* XMLNode::InsertEndChild( XMLNode* addThis ) -{ - TIXMLASSERT( addThis ); - if ( addThis->_document != _document ) { - TIXMLASSERT( false ); - return 0; - } - InsertChildPreamble( addThis ); - - if ( _lastChild ) { - TIXMLASSERT( _firstChild ); - TIXMLASSERT( _lastChild->_next == 0 ); - _lastChild->_next = addThis; - addThis->_prev = _lastChild; - _lastChild = addThis; - - addThis->_next = 0; - } - else { - TIXMLASSERT( _firstChild == 0 ); - _firstChild = _lastChild = addThis; - - addThis->_prev = 0; - addThis->_next = 0; - } - addThis->_parent = this; - return addThis; -} - - -XMLNode* XMLNode::InsertFirstChild( XMLNode* addThis ) -{ - TIXMLASSERT( addThis ); - if ( addThis->_document != _document ) { - TIXMLASSERT( false ); - return 0; - } - InsertChildPreamble( addThis ); - - if ( _firstChild ) { - TIXMLASSERT( _lastChild ); - TIXMLASSERT( _firstChild->_prev == 0 ); - - _firstChild->_prev = addThis; - addThis->_next = _firstChild; - _firstChild = addThis; - - addThis->_prev = 0; - } - else { - TIXMLASSERT( _lastChild == 0 ); - _firstChild = _lastChild = addThis; - - addThis->_prev = 0; - addThis->_next = 0; - } - addThis->_parent = this; - return addThis; -} - - -XMLNode* XMLNode::InsertAfterChild( XMLNode* afterThis, XMLNode* addThis ) -{ - TIXMLASSERT( addThis ); - if ( addThis->_document != _document ) { - TIXMLASSERT( false ); - return 0; - } - - TIXMLASSERT( afterThis ); - - if ( afterThis->_parent != this ) { - TIXMLASSERT( false ); - return 0; - } - if ( afterThis == addThis ) { - // Current state: BeforeThis -> AddThis -> OneAfterAddThis - // Now AddThis must disappear from it's location and then - // reappear between BeforeThis and OneAfterAddThis. - // So just leave it where it is. - return addThis; - } - - if ( afterThis->_next == 0 ) { - // The last node or the only node. - return InsertEndChild( addThis ); - } - InsertChildPreamble( addThis ); - addThis->_prev = afterThis; - addThis->_next = afterThis->_next; - afterThis->_next->_prev = addThis; - afterThis->_next = addThis; - addThis->_parent = this; - return addThis; -} - - - - -const XMLElement* XMLNode::FirstChildElement( const char* name ) const -{ - for( const XMLNode* node = _firstChild; node; node = node->_next ) { - const XMLElement* element = node->ToElementWithName( name ); - if ( element ) { - return element; - } - } - return 0; -} - - -const XMLElement* XMLNode::LastChildElement( const char* name ) const -{ - for( const XMLNode* node = _lastChild; node; node = node->_prev ) { - const XMLElement* element = node->ToElementWithName( name ); - if ( element ) { - return element; - } - } - return 0; -} - - -const XMLElement* XMLNode::NextSiblingElement( const char* name ) const -{ - for( const XMLNode* node = _next; node; node = node->_next ) { - const XMLElement* element = node->ToElementWithName( name ); - if ( element ) { - return element; - } - } - return 0; -} - - -const XMLElement* XMLNode::PreviousSiblingElement( const char* name ) const -{ - for( const XMLNode* node = _prev; node; node = node->_prev ) { - const XMLElement* element = node->ToElementWithName( name ); - if ( element ) { - return element; - } - } - return 0; -} - - -char* XMLNode::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) -{ - // This is a recursive method, but thinking about it "at the current level" - // it is a pretty simple flat list: - // - // - // - // With a special case: - // - // - // - // - // Where the closing element (/foo) *must* be the next thing after the opening - // element, and the names must match. BUT the tricky bit is that the closing - // element will be read by the child. - // - // 'endTag' is the end tag for this node, it is returned by a call to a child. - // 'parentEnd' is the end tag for the parent, which is filled in and returned. - - XMLDocument::DepthTracker tracker(_document); - if (_document->Error()) - return 0; - - while( p && *p ) { - XMLNode* node = 0; - - p = _document->Identify( p, &node ); - TIXMLASSERT( p ); - if ( node == 0 ) { - break; - } - - int initialLineNum = node->_parseLineNum; - - StrPair endTag; - p = node->ParseDeep( p, &endTag, curLineNumPtr ); - if ( !p ) { - DeleteNode( node ); - if ( !_document->Error() ) { - _document->SetError( XML_ERROR_PARSING, initialLineNum, 0); - } - break; - } - - XMLDeclaration* decl = node->ToDeclaration(); - if ( decl ) { - // Declarations are only allowed at document level - // - // Multiple declarations are allowed but all declarations - // must occur before anything else. - // - // Optimized due to a security test case. If the first node is - // a declaration, and the last node is a declaration, then only - // declarations have so far been addded. - bool wellLocated = false; - - if (ToDocument()) { - if (FirstChild()) { - wellLocated = - FirstChild() && - FirstChild()->ToDeclaration() && - LastChild() && - LastChild()->ToDeclaration(); - } - else { - wellLocated = true; - } - } - if ( !wellLocated ) { - _document->SetError( XML_ERROR_PARSING_DECLARATION, initialLineNum, "XMLDeclaration value=%s", decl->Value()); - DeleteNode( node ); - break; - } - } - - XMLElement* ele = node->ToElement(); - if ( ele ) { - // We read the end tag. Return it to the parent. - if ( ele->ClosingType() == XMLElement::CLOSING ) { - if ( parentEndTag ) { - ele->_value.TransferTo( parentEndTag ); - } - node->_memPool->SetTracked(); // created and then immediately deleted. - DeleteNode( node ); - return p; - } - - // Handle an end tag returned to this level. - // And handle a bunch of annoying errors. - bool mismatch = false; - if ( endTag.Empty() ) { - if ( ele->ClosingType() == XMLElement::OPEN ) { - mismatch = true; - } - } - else { - if ( ele->ClosingType() != XMLElement::OPEN ) { - mismatch = true; - } - else if ( !XMLUtil::StringEqual( endTag.GetStr(), ele->Name() ) ) { - mismatch = true; - } - } - if ( mismatch ) { - _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, initialLineNum, "XMLElement name=%s", ele->Name()); - DeleteNode( node ); - break; - } - } - InsertEndChild( node ); - } - return 0; -} - -/*static*/ void XMLNode::DeleteNode( XMLNode* node ) -{ - if ( node == 0 ) { - return; - } - TIXMLASSERT(node->_document); - if (!node->ToDocument()) { - node->_document->MarkInUse(node); - } - - MemPool* pool = node->_memPool; - node->~XMLNode(); - pool->Free( node ); -} - -void XMLNode::InsertChildPreamble( XMLNode* insertThis ) const -{ - TIXMLASSERT( insertThis ); - TIXMLASSERT( insertThis->_document == _document ); - - if (insertThis->_parent) { - insertThis->_parent->Unlink( insertThis ); - } - else { - insertThis->_document->MarkInUse(insertThis); - insertThis->_memPool->SetTracked(); - } -} - -const XMLElement* XMLNode::ToElementWithName( const char* name ) const -{ - const XMLElement* element = this->ToElement(); - if ( element == 0 ) { - return 0; - } - if ( name == 0 ) { - return element; - } - if ( XMLUtil::StringEqual( element->Name(), name ) ) { - return element; - } - return 0; -} - -// --------- XMLText ---------- // -char* XMLText::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) -{ - if ( this->CData() ) { - p = _value.ParseText( p, "]]>", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); - if ( !p ) { - _document->SetError( XML_ERROR_PARSING_CDATA, _parseLineNum, 0 ); - } - return p; - } - else { - int flags = _document->ProcessEntities() ? StrPair::TEXT_ELEMENT : StrPair::TEXT_ELEMENT_LEAVE_ENTITIES; - if ( _document->WhitespaceMode() == COLLAPSE_WHITESPACE ) { - flags |= StrPair::NEEDS_WHITESPACE_COLLAPSING; - } - - p = _value.ParseText( p, "<", flags, curLineNumPtr ); - if ( p && *p ) { - return p-1; - } - if ( !p ) { - _document->SetError( XML_ERROR_PARSING_TEXT, _parseLineNum, 0 ); - } - } - return 0; -} - - -XMLNode* XMLText::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLText* text = doc->NewText( Value() ); // fixme: this will always allocate memory. Intern? - text->SetCData( this->CData() ); - return text; -} - - -bool XMLText::ShallowEqual( const XMLNode* compare ) const -{ - TIXMLASSERT( compare ); - const XMLText* text = compare->ToText(); - return ( text && XMLUtil::StringEqual( text->Value(), Value() ) ); -} - - -bool XMLText::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - return visitor->Visit( *this ); -} - - -// --------- XMLComment ---------- // - -XMLComment::XMLComment( XMLDocument* doc ) : XMLNode( doc ) -{ -} - - -XMLComment::~XMLComment() -{ -} - - -char* XMLComment::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) -{ - // Comment parses as text. - p = _value.ParseText( p, "-->", StrPair::COMMENT, curLineNumPtr ); - if ( p == 0 ) { - _document->SetError( XML_ERROR_PARSING_COMMENT, _parseLineNum, 0 ); - } - return p; -} - - -XMLNode* XMLComment::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLComment* comment = doc->NewComment( Value() ); // fixme: this will always allocate memory. Intern? - return comment; -} - - -bool XMLComment::ShallowEqual( const XMLNode* compare ) const -{ - TIXMLASSERT( compare ); - const XMLComment* comment = compare->ToComment(); - return ( comment && XMLUtil::StringEqual( comment->Value(), Value() )); -} - - -bool XMLComment::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - return visitor->Visit( *this ); -} - - -// --------- XMLDeclaration ---------- // - -XMLDeclaration::XMLDeclaration( XMLDocument* doc ) : XMLNode( doc ) -{ -} - - -XMLDeclaration::~XMLDeclaration() -{ - //printf( "~XMLDeclaration\n" ); -} - - -char* XMLDeclaration::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) -{ - // Declaration parses as text. - p = _value.ParseText( p, "?>", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); - if ( p == 0 ) { - _document->SetError( XML_ERROR_PARSING_DECLARATION, _parseLineNum, 0 ); - } - return p; -} - - -XMLNode* XMLDeclaration::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLDeclaration* dec = doc->NewDeclaration( Value() ); // fixme: this will always allocate memory. Intern? - return dec; -} - - -bool XMLDeclaration::ShallowEqual( const XMLNode* compare ) const -{ - TIXMLASSERT( compare ); - const XMLDeclaration* declaration = compare->ToDeclaration(); - return ( declaration && XMLUtil::StringEqual( declaration->Value(), Value() )); -} - - - -bool XMLDeclaration::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - return visitor->Visit( *this ); -} - -// --------- XMLUnknown ---------- // - -XMLUnknown::XMLUnknown( XMLDocument* doc ) : XMLNode( doc ) -{ -} - - -XMLUnknown::~XMLUnknown() -{ -} - - -char* XMLUnknown::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) -{ - // Unknown parses as text. - p = _value.ParseText( p, ">", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); - if ( !p ) { - _document->SetError( XML_ERROR_PARSING_UNKNOWN, _parseLineNum, 0 ); - } - return p; -} - - -XMLNode* XMLUnknown::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLUnknown* text = doc->NewUnknown( Value() ); // fixme: this will always allocate memory. Intern? - return text; -} - - -bool XMLUnknown::ShallowEqual( const XMLNode* compare ) const -{ - TIXMLASSERT( compare ); - const XMLUnknown* unknown = compare->ToUnknown(); - return ( unknown && XMLUtil::StringEqual( unknown->Value(), Value() )); -} - - -bool XMLUnknown::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - return visitor->Visit( *this ); -} - -// --------- XMLAttribute ---------- // - -const char* XMLAttribute::Name() const -{ - return _name.GetStr(); -} - -const char* XMLAttribute::Value() const -{ - return _value.GetStr(); -} - -char* XMLAttribute::ParseDeep( char* p, bool processEntities, int* curLineNumPtr ) -{ - // Parse using the name rules: bug fix, was using ParseText before - p = _name.ParseName( p ); - if ( !p || !*p ) { - return 0; - } - - // Skip white space before = - p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); - if ( *p != '=' ) { - return 0; - } - - ++p; // move up to opening quote - p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); - if ( *p != '\"' && *p != '\'' ) { - return 0; - } - - char endTag[2] = { *p, 0 }; - ++p; // move past opening quote - - p = _value.ParseText( p, endTag, processEntities ? StrPair::ATTRIBUTE_VALUE : StrPair::ATTRIBUTE_VALUE_LEAVE_ENTITIES, curLineNumPtr ); - return p; -} - - -void XMLAttribute::SetName( const char* n ) -{ - _name.SetStr( n ); -} - - -XMLError XMLAttribute::QueryIntValue( int* value ) const -{ - if ( XMLUtil::ToInt( Value(), value )) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryUnsignedValue( unsigned int* value ) const -{ - if ( XMLUtil::ToUnsigned( Value(), value )) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryInt64Value(int64_t* value) const -{ - if (XMLUtil::ToInt64(Value(), value)) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryBoolValue( bool* value ) const -{ - if ( XMLUtil::ToBool( Value(), value )) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryFloatValue( float* value ) const -{ - if ( XMLUtil::ToFloat( Value(), value )) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -XMLError XMLAttribute::QueryDoubleValue( double* value ) const -{ - if ( XMLUtil::ToDouble( Value(), value )) { - return XML_SUCCESS; - } - return XML_WRONG_ATTRIBUTE_TYPE; -} - - -void XMLAttribute::SetAttribute( const char* v ) -{ - _value.SetStr( v ); -} - - -void XMLAttribute::SetAttribute( int v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - - -void XMLAttribute::SetAttribute( unsigned v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - - -void XMLAttribute::SetAttribute(int64_t v) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr(v, buf, BUF_SIZE); - _value.SetStr(buf); -} - - - -void XMLAttribute::SetAttribute( bool v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - -void XMLAttribute::SetAttribute( double v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - -void XMLAttribute::SetAttribute( float v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - _value.SetStr( buf ); -} - - -// --------- XMLElement ---------- // -XMLElement::XMLElement( XMLDocument* doc ) : XMLNode( doc ), - _closingType( OPEN ), - _rootAttribute( 0 ) -{ -} - - -XMLElement::~XMLElement() -{ - while( _rootAttribute ) { - XMLAttribute* next = _rootAttribute->_next; - DeleteAttribute( _rootAttribute ); - _rootAttribute = next; - } -} - - -const XMLAttribute* XMLElement::FindAttribute( const char* name ) const -{ - for( XMLAttribute* a = _rootAttribute; a; a = a->_next ) { - if ( XMLUtil::StringEqual( a->Name(), name ) ) { - return a; - } - } - return 0; -} - - -const char* XMLElement::Attribute( const char* name, const char* value ) const -{ - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return 0; - } - if ( !value || XMLUtil::StringEqual( a->Value(), value )) { - return a->Value(); - } - return 0; -} - -int XMLElement::IntAttribute(const char* name, int defaultValue) const -{ - int i = defaultValue; - QueryIntAttribute(name, &i); - return i; -} - -unsigned XMLElement::UnsignedAttribute(const char* name, unsigned defaultValue) const -{ - unsigned i = defaultValue; - QueryUnsignedAttribute(name, &i); - return i; -} - -int64_t XMLElement::Int64Attribute(const char* name, int64_t defaultValue) const -{ - int64_t i = defaultValue; - QueryInt64Attribute(name, &i); - return i; -} - -bool XMLElement::BoolAttribute(const char* name, bool defaultValue) const -{ - bool b = defaultValue; - QueryBoolAttribute(name, &b); - return b; -} - -double XMLElement::DoubleAttribute(const char* name, double defaultValue) const -{ - double d = defaultValue; - QueryDoubleAttribute(name, &d); - return d; -} - -float XMLElement::FloatAttribute(const char* name, float defaultValue) const -{ - float f = defaultValue; - QueryFloatAttribute(name, &f); - return f; -} - -const char* XMLElement::GetText() const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - return FirstChild()->Value(); - } - return 0; -} - - -void XMLElement::SetText( const char* inText ) -{ - if ( FirstChild() && FirstChild()->ToText() ) - FirstChild()->SetValue( inText ); - else { - XMLText* theText = GetDocument()->NewText( inText ); - InsertFirstChild( theText ); - } -} - - -void XMLElement::SetText( int v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText( unsigned v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText(int64_t v) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr(v, buf, BUF_SIZE); - SetText(buf); -} - - -void XMLElement::SetText( bool v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText( float v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -void XMLElement::SetText( double v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - SetText( buf ); -} - - -XMLError XMLElement::QueryIntText( int* ival ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->Value(); - if ( XMLUtil::ToInt( t, ival ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryUnsignedText( unsigned* uval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->Value(); - if ( XMLUtil::ToUnsigned( t, uval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryInt64Text(int64_t* ival) const -{ - if (FirstChild() && FirstChild()->ToText()) { - const char* t = FirstChild()->Value(); - if (XMLUtil::ToInt64(t, ival)) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryBoolText( bool* bval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->Value(); - if ( XMLUtil::ToBool( t, bval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryDoubleText( double* dval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->Value(); - if ( XMLUtil::ToDouble( t, dval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - - -XMLError XMLElement::QueryFloatText( float* fval ) const -{ - if ( FirstChild() && FirstChild()->ToText() ) { - const char* t = FirstChild()->Value(); - if ( XMLUtil::ToFloat( t, fval ) ) { - return XML_SUCCESS; - } - return XML_CAN_NOT_CONVERT_TEXT; - } - return XML_NO_TEXT_NODE; -} - -int XMLElement::IntText(int defaultValue) const -{ - int i = defaultValue; - QueryIntText(&i); - return i; -} - -unsigned XMLElement::UnsignedText(unsigned defaultValue) const -{ - unsigned i = defaultValue; - QueryUnsignedText(&i); - return i; -} - -int64_t XMLElement::Int64Text(int64_t defaultValue) const -{ - int64_t i = defaultValue; - QueryInt64Text(&i); - return i; -} - -bool XMLElement::BoolText(bool defaultValue) const -{ - bool b = defaultValue; - QueryBoolText(&b); - return b; -} - -double XMLElement::DoubleText(double defaultValue) const -{ - double d = defaultValue; - QueryDoubleText(&d); - return d; -} - -float XMLElement::FloatText(float defaultValue) const -{ - float f = defaultValue; - QueryFloatText(&f); - return f; -} - - -XMLAttribute* XMLElement::FindOrCreateAttribute( const char* name ) -{ - XMLAttribute* last = 0; - XMLAttribute* attrib = 0; - for( attrib = _rootAttribute; - attrib; - last = attrib, attrib = attrib->_next ) { - if ( XMLUtil::StringEqual( attrib->Name(), name ) ) { - break; - } - } - if ( !attrib ) { - attrib = CreateAttribute(); - TIXMLASSERT( attrib ); - if ( last ) { - TIXMLASSERT( last->_next == 0 ); - last->_next = attrib; - } - else { - TIXMLASSERT( _rootAttribute == 0 ); - _rootAttribute = attrib; - } - attrib->SetName( name ); - } - return attrib; -} - - -void XMLElement::DeleteAttribute( const char* name ) -{ - XMLAttribute* prev = 0; - for( XMLAttribute* a=_rootAttribute; a; a=a->_next ) { - if ( XMLUtil::StringEqual( name, a->Name() ) ) { - if ( prev ) { - prev->_next = a->_next; - } - else { - _rootAttribute = a->_next; - } - DeleteAttribute( a ); - break; - } - prev = a; - } -} - - -char* XMLElement::ParseAttributes( char* p, int* curLineNumPtr ) -{ - XMLAttribute* prevAttribute = 0; - - // Read the attributes. - while( p ) { - p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); - if ( !(*p) ) { - _document->SetError( XML_ERROR_PARSING_ELEMENT, _parseLineNum, "XMLElement name=%s", Name() ); - return 0; - } - - // attribute. - if (XMLUtil::IsNameStartChar( *p ) ) { - XMLAttribute* attrib = CreateAttribute(); - TIXMLASSERT( attrib ); - attrib->_parseLineNum = _document->_parseCurLineNum; - - int attrLineNum = attrib->_parseLineNum; - - p = attrib->ParseDeep( p, _document->ProcessEntities(), curLineNumPtr ); - if ( !p || Attribute( attrib->Name() ) ) { - DeleteAttribute( attrib ); - _document->SetError( XML_ERROR_PARSING_ATTRIBUTE, attrLineNum, "XMLElement name=%s", Name() ); - return 0; - } - // There is a minor bug here: if the attribute in the source xml - // document is duplicated, it will not be detected and the - // attribute will be doubly added. However, tracking the 'prevAttribute' - // avoids re-scanning the attribute list. Preferring performance for - // now, may reconsider in the future. - if ( prevAttribute ) { - TIXMLASSERT( prevAttribute->_next == 0 ); - prevAttribute->_next = attrib; - } - else { - TIXMLASSERT( _rootAttribute == 0 ); - _rootAttribute = attrib; - } - prevAttribute = attrib; - } - // end of the tag - else if ( *p == '>' ) { - ++p; - break; - } - // end of the tag - else if ( *p == '/' && *(p+1) == '>' ) { - _closingType = CLOSED; - return p+2; // done; sealed element. - } - else { - _document->SetError( XML_ERROR_PARSING_ELEMENT, _parseLineNum, 0 ); - return 0; - } - } - return p; -} - -void XMLElement::DeleteAttribute( XMLAttribute* attribute ) -{ - if ( attribute == 0 ) { - return; - } - MemPool* pool = attribute->_memPool; - attribute->~XMLAttribute(); - pool->Free( attribute ); -} - -XMLAttribute* XMLElement::CreateAttribute() -{ - TIXMLASSERT( sizeof( XMLAttribute ) == _document->_attributePool.ItemSize() ); - XMLAttribute* attrib = new (_document->_attributePool.Alloc() ) XMLAttribute(); - TIXMLASSERT( attrib ); - attrib->_memPool = &_document->_attributePool; - attrib->_memPool->SetTracked(); - return attrib; -} - -// -// -// foobar -// -char* XMLElement::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) -{ - // Read the element name. - p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); - - // The closing element is the form. It is - // parsed just like a regular element then deleted from - // the DOM. - if ( *p == '/' ) { - _closingType = CLOSING; - ++p; - } - - p = _value.ParseName( p ); - if ( _value.Empty() ) { - return 0; - } - - p = ParseAttributes( p, curLineNumPtr ); - if ( !p || !*p || _closingType != OPEN ) { - return p; - } - - p = XMLNode::ParseDeep( p, parentEndTag, curLineNumPtr ); - return p; -} - - - -XMLNode* XMLElement::ShallowClone( XMLDocument* doc ) const -{ - if ( !doc ) { - doc = _document; - } - XMLElement* element = doc->NewElement( Value() ); // fixme: this will always allocate memory. Intern? - for( const XMLAttribute* a=FirstAttribute(); a; a=a->Next() ) { - element->SetAttribute( a->Name(), a->Value() ); // fixme: this will always allocate memory. Intern? - } - return element; -} - - -bool XMLElement::ShallowEqual( const XMLNode* compare ) const -{ - TIXMLASSERT( compare ); - const XMLElement* other = compare->ToElement(); - if ( other && XMLUtil::StringEqual( other->Name(), Name() )) { - - const XMLAttribute* a=FirstAttribute(); - const XMLAttribute* b=other->FirstAttribute(); - - while ( a && b ) { - if ( !XMLUtil::StringEqual( a->Value(), b->Value() ) ) { - return false; - } - a = a->Next(); - b = b->Next(); - } - if ( a || b ) { - // different count - return false; - } - return true; - } - return false; -} - - -bool XMLElement::Accept( XMLVisitor* visitor ) const -{ - TIXMLASSERT( visitor ); - if ( visitor->VisitEnter( *this, _rootAttribute ) ) { - for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) { - if ( !node->Accept( visitor ) ) { - break; - } - } - } - return visitor->VisitExit( *this ); -} - - -// --------- XMLDocument ----------- // - -// Warning: List must match 'enum XMLError' -const char* XMLDocument::_errorNames[XML_ERROR_COUNT] = { - "XML_SUCCESS", - "XML_NO_ATTRIBUTE", - "XML_WRONG_ATTRIBUTE_TYPE", - "XML_ERROR_FILE_NOT_FOUND", - "XML_ERROR_FILE_COULD_NOT_BE_OPENED", - "XML_ERROR_FILE_READ_ERROR", - "XML_ERROR_PARSING_ELEMENT", - "XML_ERROR_PARSING_ATTRIBUTE", - "XML_ERROR_PARSING_TEXT", - "XML_ERROR_PARSING_CDATA", - "XML_ERROR_PARSING_COMMENT", - "XML_ERROR_PARSING_DECLARATION", - "XML_ERROR_PARSING_UNKNOWN", - "XML_ERROR_EMPTY_DOCUMENT", - "XML_ERROR_MISMATCHED_ELEMENT", - "XML_ERROR_PARSING", - "XML_CAN_NOT_CONVERT_TEXT", - "XML_NO_TEXT_NODE", - "XML_ELEMENT_DEPTH_EXCEEDED" -}; - - -XMLDocument::XMLDocument( bool processEntities, Whitespace whitespaceMode ) : - XMLNode( 0 ), - _writeBOM( false ), - _processEntities( processEntities ), - _errorID(XML_SUCCESS), - _whitespaceMode( whitespaceMode ), - _errorStr(), - _errorLineNum( 0 ), - _charBuffer( 0 ), - _parseCurLineNum( 0 ), - _parsingDepth(0), - _unlinked(), - _elementPool(), - _attributePool(), - _textPool(), - _commentPool() -{ - // avoid VC++ C4355 warning about 'this' in initializer list (C4355 is off by default in VS2012+) - _document = this; -} - - -XMLDocument::~XMLDocument() -{ - Clear(); -} - - -void XMLDocument::MarkInUse(XMLNode* node) -{ - TIXMLASSERT(node); - TIXMLASSERT(node->_parent == 0); - - for (int i = 0; i < _unlinked.Size(); ++i) { - if (node == _unlinked[i]) { - _unlinked.SwapRemove(i); - break; - } - } -} - -void XMLDocument::Clear() -{ - DeleteChildren(); - while( _unlinked.Size()) { - DeleteNode(_unlinked[0]); // Will remove from _unlinked as part of delete. - } - -#ifdef TINYXML2_DEBUG - const bool hadError = Error(); -#endif - ClearError(); - - delete [] _charBuffer; - _charBuffer = 0; - _parsingDepth = 0; - -#if 0 - _textPool.Trace( "text" ); - _elementPool.Trace( "element" ); - _commentPool.Trace( "comment" ); - _attributePool.Trace( "attribute" ); -#endif - -#ifdef TINYXML2_DEBUG - if ( !hadError ) { - TIXMLASSERT( _elementPool.CurrentAllocs() == _elementPool.Untracked() ); - TIXMLASSERT( _attributePool.CurrentAllocs() == _attributePool.Untracked() ); - TIXMLASSERT( _textPool.CurrentAllocs() == _textPool.Untracked() ); - TIXMLASSERT( _commentPool.CurrentAllocs() == _commentPool.Untracked() ); - } -#endif -} - - -void XMLDocument::DeepCopy(XMLDocument* target) const -{ - TIXMLASSERT(target); - if (target == this) { - return; // technically success - a no-op. - } - - target->Clear(); - for (const XMLNode* node = this->FirstChild(); node; node = node->NextSibling()) { - target->InsertEndChild(node->DeepClone(target)); - } -} - -XMLElement* XMLDocument::NewElement( const char* name ) -{ - XMLElement* ele = CreateUnlinkedNode( _elementPool ); - ele->SetName( name ); - return ele; -} - - -XMLComment* XMLDocument::NewComment( const char* str ) -{ - XMLComment* comment = CreateUnlinkedNode( _commentPool ); - comment->SetValue( str ); - return comment; -} - - -XMLText* XMLDocument::NewText( const char* str ) -{ - XMLText* text = CreateUnlinkedNode( _textPool ); - text->SetValue( str ); - return text; -} - - -XMLDeclaration* XMLDocument::NewDeclaration( const char* str ) -{ - XMLDeclaration* dec = CreateUnlinkedNode( _commentPool ); - dec->SetValue( str ? str : "xml version=\"1.0\" encoding=\"UTF-8\"" ); - return dec; -} - - -XMLUnknown* XMLDocument::NewUnknown( const char* str ) -{ - XMLUnknown* unk = CreateUnlinkedNode( _commentPool ); - unk->SetValue( str ); - return unk; -} - -static FILE* callfopen( const char* filepath, const char* mode ) -{ - TIXMLASSERT( filepath ); - TIXMLASSERT( mode ); -#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE) - FILE* fp = 0; - errno_t err = fopen_s( &fp, filepath, mode ); - if ( err ) { - return 0; - } -#else - FILE* fp = fopen( filepath, mode ); -#endif - return fp; -} - -void XMLDocument::DeleteNode( XMLNode* node ) { - TIXMLASSERT( node ); - TIXMLASSERT(node->_document == this ); - if (node->_parent) { - node->_parent->DeleteChild( node ); - } - else { - // Isn't in the tree. - // Use the parent delete. - // Also, we need to mark it tracked: we 'know' - // it was never used. - node->_memPool->SetTracked(); - // Call the static XMLNode version: - XMLNode::DeleteNode(node); - } -} - - -XMLError XMLDocument::LoadFile( const char* filename ) -{ - if ( !filename ) { - TIXMLASSERT( false ); - SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, 0, "filename=" ); - return _errorID; - } - - Clear(); - FILE* fp = callfopen( filename, "rb" ); - if ( !fp ) { - SetError( XML_ERROR_FILE_NOT_FOUND, 0, "filename=%s", filename ); - return _errorID; - } - LoadFile( fp ); - fclose( fp ); - return _errorID; -} - -// This is likely overengineered template art to have a check that unsigned long value incremented -// by one still fits into size_t. If size_t type is larger than unsigned long type -// (x86_64-w64-mingw32 target) then the check is redundant and gcc and clang emit -// -Wtype-limits warning. This piece makes the compiler select code with a check when a check -// is useful and code with no check when a check is redundant depending on how size_t and unsigned long -// types sizes relate to each other. -template -= sizeof(size_t))> -struct LongFitsIntoSizeTMinusOne { - static bool Fits( unsigned long value ) - { - return value < (size_t)-1; - } -}; - -template <> -struct LongFitsIntoSizeTMinusOne { - static bool Fits( unsigned long ) - { - return true; - } -}; - -XMLError XMLDocument::LoadFile( FILE* fp ) -{ - Clear(); - - fseek( fp, 0, SEEK_SET ); - if ( fgetc( fp ) == EOF && ferror( fp ) != 0 ) { - SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); - return _errorID; - } - - fseek( fp, 0, SEEK_END ); - const long filelength = ftell( fp ); - fseek( fp, 0, SEEK_SET ); - if ( filelength == -1L ) { - SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); - return _errorID; - } - TIXMLASSERT( filelength >= 0 ); - - if ( !LongFitsIntoSizeTMinusOne<>::Fits( filelength ) ) { - // Cannot handle files which won't fit in buffer together with null terminator - SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); - return _errorID; - } - - if ( filelength == 0 ) { - SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); - return _errorID; - } - - const size_t size = filelength; - TIXMLASSERT( _charBuffer == 0 ); - _charBuffer = new char[size+1]; - size_t read = fread( _charBuffer, 1, size, fp ); - if ( read != size ) { - SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); - return _errorID; - } - - _charBuffer[size] = 0; - - Parse(); - return _errorID; -} - - -XMLError XMLDocument::SaveFile( const char* filename, bool compact ) -{ - if ( !filename ) { - TIXMLASSERT( false ); - SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, 0, "filename=" ); - return _errorID; - } - - FILE* fp = callfopen( filename, "w" ); - if ( !fp ) { - SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, 0, "filename=%s", filename ); - return _errorID; - } - SaveFile(fp, compact); - fclose( fp ); - return _errorID; -} - - -XMLError XMLDocument::SaveFile( FILE* fp, bool compact ) -{ - // Clear any error from the last save, otherwise it will get reported - // for *this* call. - ClearError(); - XMLPrinter stream( fp, compact ); - Print( &stream ); - return _errorID; -} - - -XMLError XMLDocument::Parse( const char* p, size_t len ) -{ - Clear(); - - if ( len == 0 || !p || !*p ) { - SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); - return _errorID; - } - if ( len == (size_t)(-1) ) { - len = strlen( p ); - } - TIXMLASSERT( _charBuffer == 0 ); - _charBuffer = new char[ len+1 ]; - memcpy( _charBuffer, p, len ); - _charBuffer[len] = 0; - - Parse(); - if ( Error() ) { - // clean up now essentially dangling memory. - // and the parse fail can put objects in the - // pools that are dead and inaccessible. - DeleteChildren(); - _elementPool.Clear(); - _attributePool.Clear(); - _textPool.Clear(); - _commentPool.Clear(); - } - return _errorID; -} - - -void XMLDocument::Print( XMLPrinter* streamer ) const -{ - if ( streamer ) { - Accept( streamer ); - } - else { - XMLPrinter stdoutStreamer( stdout ); - Accept( &stdoutStreamer ); - } -} - - -void XMLDocument::SetError( XMLError error, int lineNum, const char* format, ... ) -{ - TIXMLASSERT( error >= 0 && error < XML_ERROR_COUNT ); - _errorID = error; - _errorLineNum = lineNum; - _errorStr.Reset(); - - size_t BUFFER_SIZE = 1000; - char* buffer = new char[BUFFER_SIZE]; - - TIXMLASSERT(sizeof(error) <= sizeof(int)); - TIXML_SNPRINTF(buffer, BUFFER_SIZE, "Error=%s ErrorID=%d (0x%x) Line number=%d", ErrorIDToName(error), int(error), int(error), lineNum); - - if (format) { - size_t len = strlen(buffer); - TIXML_SNPRINTF(buffer + len, BUFFER_SIZE - len, ": "); - len = strlen(buffer); - - va_list va; - va_start(va, format); - TIXML_VSNPRINTF(buffer + len, BUFFER_SIZE - len, format, va); - va_end(va); - } - _errorStr.SetStr(buffer); - delete[] buffer; -} - - -/*static*/ const char* XMLDocument::ErrorIDToName(XMLError errorID) -{ - TIXMLASSERT( errorID >= 0 && errorID < XML_ERROR_COUNT ); - const char* errorName = _errorNames[errorID]; - TIXMLASSERT( errorName && errorName[0] ); - return errorName; -} - -const char* XMLDocument::ErrorStr() const -{ - return _errorStr.Empty() ? "" : _errorStr.GetStr(); -} - - -void XMLDocument::PrintError() const -{ - printf("%s\n", ErrorStr()); -} - -const char* XMLDocument::ErrorName() const -{ - return ErrorIDToName(_errorID); -} - -void XMLDocument::Parse() -{ - TIXMLASSERT( NoChildren() ); // Clear() must have been called previously - TIXMLASSERT( _charBuffer ); - _parseCurLineNum = 1; - _parseLineNum = 1; - char* p = _charBuffer; - p = XMLUtil::SkipWhiteSpace( p, &_parseCurLineNum ); - p = const_cast( XMLUtil::ReadBOM( p, &_writeBOM ) ); - if ( !*p ) { - SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); - return; - } - ParseDeep(p, 0, &_parseCurLineNum ); -} - -void XMLDocument::PushDepth() -{ - _parsingDepth++; - if (_parsingDepth == TINYXML2_MAX_ELEMENT_DEPTH) { - SetError(XML_ELEMENT_DEPTH_EXCEEDED, _parseCurLineNum, "Element nesting is too deep." ); - } -} - -void XMLDocument::PopDepth() -{ - TIXMLASSERT(_parsingDepth > 0); - --_parsingDepth; -} - -XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) : - _elementJustOpened( false ), - _stack(), - _firstElement( true ), - _fp( file ), - _depth( depth ), - _textDepth( -1 ), - _processEntities( true ), - _compactMode( compact ), - _buffer() -{ - for( int i=0; i'] = true; // not required, but consistency is nice - _buffer.Push( 0 ); -} - - -void XMLPrinter::Print( const char* format, ... ) -{ - va_list va; - va_start( va, format ); - - if ( _fp ) { - vfprintf( _fp, format, va ); - } - else { - const int len = TIXML_VSCPRINTF( format, va ); - // Close out and re-start the va-args - va_end( va ); - TIXMLASSERT( len >= 0 ); - va_start( va, format ); - TIXMLASSERT( _buffer.Size() > 0 && _buffer[_buffer.Size() - 1] == 0 ); - char* p = _buffer.PushArr( len ) - 1; // back up over the null terminator. - TIXML_VSNPRINTF( p, len+1, format, va ); - } - va_end( va ); -} - - -void XMLPrinter::Write( const char* data, size_t size ) -{ - if ( _fp ) { - fwrite ( data , sizeof(char), size, _fp); - } - else { - char* p = _buffer.PushArr( static_cast(size) ) - 1; // back up over the null terminator. - memcpy( p, data, size ); - p[size] = 0; - } -} - - -void XMLPrinter::Putc( char ch ) -{ - if ( _fp ) { - fputc ( ch, _fp); - } - else { - char* p = _buffer.PushArr( sizeof(char) ) - 1; // back up over the null terminator. - p[0] = ch; - p[1] = 0; - } -} - - -void XMLPrinter::PrintSpace( int depth ) -{ - for( int i=0; i 0 && *q < ENTITY_RANGE ) { - // Check for entities. If one is found, flush - // the stream up until the entity, write the - // entity, and keep looking. - if ( flag[(unsigned char)(*q)] ) { - while ( p < q ) { - const size_t delta = q - p; - const int toPrint = ( INT_MAX < delta ) ? INT_MAX : (int)delta; - Write( p, toPrint ); - p += toPrint; - } - bool entityPatternPrinted = false; - for( int i=0; i( bom ) ); - } - if ( writeDec ) { - PushDeclaration( "xml version=\"1.0\"" ); - } -} - - -void XMLPrinter::OpenElement( const char* name, bool compactMode ) -{ - SealElementIfJustOpened(); - _stack.Push( name ); - - if ( _textDepth < 0 && !_firstElement && !compactMode ) { - Putc( '\n' ); - } - if ( !compactMode ) { - PrintSpace( _depth ); - } - - Write ( "<" ); - Write ( name ); - - _elementJustOpened = true; - _firstElement = false; - ++_depth; -} - - -void XMLPrinter::PushAttribute( const char* name, const char* value ) -{ - TIXMLASSERT( _elementJustOpened ); - Putc ( ' ' ); - Write( name ); - Write( "=\"" ); - PrintString( value, false ); - Putc ( '\"' ); -} - - -void XMLPrinter::PushAttribute( const char* name, int v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::PushAttribute( const char* name, unsigned v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::PushAttribute(const char* name, int64_t v) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr(v, buf, BUF_SIZE); - PushAttribute(name, buf); -} - - -void XMLPrinter::PushAttribute( const char* name, bool v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::PushAttribute( const char* name, double v ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( v, buf, BUF_SIZE ); - PushAttribute( name, buf ); -} - - -void XMLPrinter::CloseElement( bool compactMode ) -{ - --_depth; - const char* name = _stack.Pop(); - - if ( _elementJustOpened ) { - Write( "/>" ); - } - else { - if ( _textDepth < 0 && !compactMode) { - Putc( '\n' ); - PrintSpace( _depth ); - } - Write ( "" ); - } - - if ( _textDepth == _depth ) { - _textDepth = -1; - } - if ( _depth == 0 && !compactMode) { - Putc( '\n' ); - } - _elementJustOpened = false; -} - - -void XMLPrinter::SealElementIfJustOpened() -{ - if ( !_elementJustOpened ) { - return; - } - _elementJustOpened = false; - Putc( '>' ); -} - - -void XMLPrinter::PushText( const char* text, bool cdata ) -{ - _textDepth = _depth-1; - - SealElementIfJustOpened(); - if ( cdata ) { - Write( "" ); - } - else { - PrintString( text, true ); - } -} - -void XMLPrinter::PushText( int64_t value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - -void XMLPrinter::PushText( int value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( unsigned value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( bool value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( float value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushText( double value ) -{ - char buf[BUF_SIZE]; - XMLUtil::ToStr( value, buf, BUF_SIZE ); - PushText( buf, false ); -} - - -void XMLPrinter::PushComment( const char* comment ) -{ - SealElementIfJustOpened(); - if ( _textDepth < 0 && !_firstElement && !_compactMode) { - Putc( '\n' ); - PrintSpace( _depth ); - } - _firstElement = false; - - Write( "" ); -} - - -void XMLPrinter::PushDeclaration( const char* value ) -{ - SealElementIfJustOpened(); - if ( _textDepth < 0 && !_firstElement && !_compactMode) { - Putc( '\n' ); - PrintSpace( _depth ); - } - _firstElement = false; - - Write( "" ); -} - - -void XMLPrinter::PushUnknown( const char* value ) -{ - SealElementIfJustOpened(); - if ( _textDepth < 0 && !_firstElement && !_compactMode) { - Putc( '\n' ); - PrintSpace( _depth ); - } - _firstElement = false; - - Write( "' ); -} - - -bool XMLPrinter::VisitEnter( const XMLDocument& doc ) -{ - _processEntities = doc.ProcessEntities(); - if ( doc.HasBOM() ) { - PushHeader( true, false ); - } - return true; -} - - -bool XMLPrinter::VisitEnter( const XMLElement& element, const XMLAttribute* attribute ) -{ - const XMLElement* parentElem = 0; - if ( element.Parent() ) { - parentElem = element.Parent()->ToElement(); - } - const bool compactMode = parentElem ? CompactMode( *parentElem ) : _compactMode; - OpenElement( element.Name(), compactMode ); - while ( attribute ) { - PushAttribute( attribute->Name(), attribute->Value() ); - attribute = attribute->Next(); - } - return true; -} - - -bool XMLPrinter::VisitExit( const XMLElement& element ) -{ - CloseElement( CompactMode(element) ); - return true; -} - - -bool XMLPrinter::Visit( const XMLText& text ) -{ - PushText( text.Value(), text.CData() ); - return true; -} - - -bool XMLPrinter::Visit( const XMLComment& comment ) -{ - PushComment( comment.Value() ); - return true; -} - -bool XMLPrinter::Visit( const XMLDeclaration& declaration ) -{ - PushDeclaration( declaration.Value() ); - return true; -} - - -bool XMLPrinter::Visit( const XMLUnknown& unknown ) -{ - PushUnknown( unknown.Value() ); - return true; -} - -} // namespace tinyxml2 diff --git a/ZAPDTR/lib/tinyxml2/tinyxml2.h b/ZAPDTR/lib/tinyxml2/tinyxml2.h deleted file mode 100644 index 7cd312736..000000000 --- a/ZAPDTR/lib/tinyxml2/tinyxml2.h +++ /dev/null @@ -1,2309 +0,0 @@ -/* -Original code by Lee Thomason (www.grinninglizard.com) - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any -damages arising from the use of this software. - -Permission is granted to anyone to use this software for any -purpose, including commercial applications, and to alter it and -redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must -not claim that you wrote the original software. If you use this -software in a product, an acknowledgment in the product documentation -would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and -must not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source -distribution. -*/ - -#ifndef TINYXML2_INCLUDED -#define TINYXML2_INCLUDED - -#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) -# include -# include -# include -# include -# include -# if defined(__PS3__) -# include -# endif -#else -# include -# include -# include -# include -# include -#endif -#include - -/* - TODO: intern strings instead of allocation. -*/ -/* - gcc: - g++ -Wall -DTINYXML2_DEBUG tinyxml2.cpp xmltest.cpp -o gccxmltest.exe - - Formatting, Artistic Style: - AStyle.exe --style=1tbs --indent-switches --break-closing-brackets --indent-preprocessor tinyxml2.cpp tinyxml2.h -*/ - -#if defined( _DEBUG ) || defined (__DEBUG__) -# ifndef TINYXML2_DEBUG -# define TINYXML2_DEBUG -# endif -#endif - -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable: 4251) -#endif - -#ifdef _WIN32 -# ifdef TINYXML2_EXPORT -# define TINYXML2_LIB __declspec(dllexport) -# elif defined(TINYXML2_IMPORT) -# define TINYXML2_LIB __declspec(dllimport) -# else -# define TINYXML2_LIB -# endif -#elif __GNUC__ >= 4 -# define TINYXML2_LIB __attribute__((visibility("default"))) -#else -# define TINYXML2_LIB -#endif - - -#if defined(TINYXML2_DEBUG) -# if defined(_MSC_VER) -# // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like -# define TIXMLASSERT( x ) if ( !((void)0,(x))) { __debugbreak(); } -# elif defined (ANDROID_NDK) -# include -# define TIXMLASSERT( x ) if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); } -# else -# include -# define TIXMLASSERT assert -# endif -#else -# define TIXMLASSERT( x ) {} -#endif - - -/* Versioning, past 1.0.14: - http://semver.org/ -*/ -static const int TIXML2_MAJOR_VERSION = 7; -static const int TIXML2_MINOR_VERSION = 0; -static const int TIXML2_PATCH_VERSION = 1; - -#define TINYXML2_MAJOR_VERSION 7 -#define TINYXML2_MINOR_VERSION 0 -#define TINYXML2_PATCH_VERSION 1 - -// A fixed element depth limit is problematic. There needs to be a -// limit to avoid a stack overflow. However, that limit varies per -// system, and the capacity of the stack. On the other hand, it's a trivial -// attack that can result from ill, malicious, or even correctly formed XML, -// so there needs to be a limit in place. -static const int TINYXML2_MAX_ELEMENT_DEPTH = 100; - -namespace tinyxml2 -{ -class XMLDocument; -class XMLElement; -class XMLAttribute; -class XMLComment; -class XMLText; -class XMLDeclaration; -class XMLUnknown; -class XMLPrinter; - -/* - A class that wraps strings. Normally stores the start and end - pointers into the XML file itself, and will apply normalization - and entity translation if actually read. Can also store (and memory - manage) a traditional char[] - - Isn't clear why TINYXML2_LIB is needed; but seems to fix #719 -*/ -class TINYXML2_LIB StrPair -{ -public: - enum { - NEEDS_ENTITY_PROCESSING = 0x01, - NEEDS_NEWLINE_NORMALIZATION = 0x02, - NEEDS_WHITESPACE_COLLAPSING = 0x04, - - TEXT_ELEMENT = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION, - TEXT_ELEMENT_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION, - ATTRIBUTE_NAME = 0, - ATTRIBUTE_VALUE = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION, - ATTRIBUTE_VALUE_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION, - COMMENT = NEEDS_NEWLINE_NORMALIZATION - }; - - StrPair() : _flags( 0 ), _start( 0 ), _end( 0 ) {} - ~StrPair(); - - void Set( char* start, char* end, int flags ) { - TIXMLASSERT( start ); - TIXMLASSERT( end ); - Reset(); - _start = start; - _end = end; - _flags = flags | NEEDS_FLUSH; - } - - const char* GetStr(); - - bool Empty() const { - return _start == _end; - } - - void SetInternedStr( const char* str ) { - Reset(); - _start = const_cast(str); - } - - void SetStr( const char* str, int flags=0 ); - - char* ParseText( char* in, const char* endTag, int strFlags, int* curLineNumPtr ); - char* ParseName( char* in ); - - void TransferTo( StrPair* other ); - void Reset(); - -private: - void CollapseWhitespace(); - - enum { - NEEDS_FLUSH = 0x100, - NEEDS_DELETE = 0x200 - }; - - int _flags; - char* _start; - char* _end; - - StrPair( const StrPair& other ); // not supported - void operator=( const StrPair& other ); // not supported, use TransferTo() -}; - - -/* - A dynamic array of Plain Old Data. Doesn't support constructors, etc. - Has a small initial memory pool, so that low or no usage will not - cause a call to new/delete -*/ -template -class DynArray -{ -public: - DynArray() : - _mem( _pool ), - _allocated( INITIAL_SIZE ), - _size( 0 ) - { - } - - ~DynArray() { - if ( _mem != _pool ) { - delete [] _mem; - } - } - - void Clear() { - _size = 0; - } - - void Push( T t ) { - TIXMLASSERT( _size < INT_MAX ); - EnsureCapacity( _size+1 ); - _mem[_size] = t; - ++_size; - } - - T* PushArr( int count ) { - TIXMLASSERT( count >= 0 ); - TIXMLASSERT( _size <= INT_MAX - count ); - EnsureCapacity( _size+count ); - T* ret = &_mem[_size]; - _size += count; - return ret; - } - - T Pop() { - TIXMLASSERT( _size > 0 ); - --_size; - return _mem[_size]; - } - - void PopArr( int count ) { - TIXMLASSERT( _size >= count ); - _size -= count; - } - - bool Empty() const { - return _size == 0; - } - - T& operator[](int i) { - TIXMLASSERT( i>= 0 && i < _size ); - return _mem[i]; - } - - const T& operator[](int i) const { - TIXMLASSERT( i>= 0 && i < _size ); - return _mem[i]; - } - - const T& PeekTop() const { - TIXMLASSERT( _size > 0 ); - return _mem[ _size - 1]; - } - - int Size() const { - TIXMLASSERT( _size >= 0 ); - return _size; - } - - int Capacity() const { - TIXMLASSERT( _allocated >= INITIAL_SIZE ); - return _allocated; - } - - void SwapRemove(int i) { - TIXMLASSERT(i >= 0 && i < _size); - TIXMLASSERT(_size > 0); - _mem[i] = _mem[_size - 1]; - --_size; - } - - const T* Mem() const { - TIXMLASSERT( _mem ); - return _mem; - } - - T* Mem() { - TIXMLASSERT( _mem ); - return _mem; - } - -private: - DynArray( const DynArray& ); // not supported - void operator=( const DynArray& ); // not supported - - void EnsureCapacity( int cap ) { - TIXMLASSERT( cap > 0 ); - if ( cap > _allocated ) { - TIXMLASSERT( cap <= INT_MAX / 2 ); - int newAllocated = cap * 2; - T* newMem = new T[newAllocated]; - TIXMLASSERT( newAllocated >= _size ); - memcpy( newMem, _mem, sizeof(T)*_size ); // warning: not using constructors, only works for PODs - if ( _mem != _pool ) { - delete [] _mem; - } - _mem = newMem; - _allocated = newAllocated; - } - } - - T* _mem; - T _pool[INITIAL_SIZE]; - int _allocated; // objects allocated - int _size; // number objects in use -}; - - -/* - Parent virtual class of a pool for fast allocation - and deallocation of objects. -*/ -class MemPool -{ -public: - MemPool() {} - virtual ~MemPool() {} - - virtual int ItemSize() const = 0; - virtual void* Alloc() = 0; - virtual void Free( void* ) = 0; - virtual void SetTracked() = 0; -}; - - -/* - Template child class to create pools of the correct type. -*/ -template< int ITEM_SIZE > -class MemPoolT : public MemPool -{ -public: - MemPoolT() : _blockPtrs(), _root(0), _currentAllocs(0), _nAllocs(0), _maxAllocs(0), _nUntracked(0) {} - ~MemPoolT() { - MemPoolT< ITEM_SIZE >::Clear(); - } - - void Clear() { - // Delete the blocks. - while( !_blockPtrs.Empty()) { - Block* lastBlock = _blockPtrs.Pop(); - delete lastBlock; - } - _root = 0; - _currentAllocs = 0; - _nAllocs = 0; - _maxAllocs = 0; - _nUntracked = 0; - } - - virtual int ItemSize() const { - return ITEM_SIZE; - } - int CurrentAllocs() const { - return _currentAllocs; - } - - virtual void* Alloc() { - if ( !_root ) { - // Need a new block. - Block* block = new Block(); - _blockPtrs.Push( block ); - - Item* blockItems = block->items; - for( int i = 0; i < ITEMS_PER_BLOCK - 1; ++i ) { - blockItems[i].next = &(blockItems[i + 1]); - } - blockItems[ITEMS_PER_BLOCK - 1].next = 0; - _root = blockItems; - } - Item* const result = _root; - TIXMLASSERT( result != 0 ); - _root = _root->next; - - ++_currentAllocs; - if ( _currentAllocs > _maxAllocs ) { - _maxAllocs = _currentAllocs; - } - ++_nAllocs; - ++_nUntracked; - return result; - } - - virtual void Free( void* mem ) { - if ( !mem ) { - return; - } - --_currentAllocs; - Item* item = static_cast( mem ); -#ifdef TINYXML2_DEBUG - memset( item, 0xfe, sizeof( *item ) ); -#endif - item->next = _root; - _root = item; - } - void Trace( const char* name ) { - printf( "Mempool %s watermark=%d [%dk] current=%d size=%d nAlloc=%d blocks=%d\n", - name, _maxAllocs, _maxAllocs * ITEM_SIZE / 1024, _currentAllocs, - ITEM_SIZE, _nAllocs, _blockPtrs.Size() ); - } - - void SetTracked() { - --_nUntracked; - } - - int Untracked() const { - return _nUntracked; - } - - // This number is perf sensitive. 4k seems like a good tradeoff on my machine. - // The test file is large, 170k. - // Release: VS2010 gcc(no opt) - // 1k: 4000 - // 2k: 4000 - // 4k: 3900 21000 - // 16k: 5200 - // 32k: 4300 - // 64k: 4000 21000 - // Declared public because some compilers do not accept to use ITEMS_PER_BLOCK - // in private part if ITEMS_PER_BLOCK is private - enum { ITEMS_PER_BLOCK = (4 * 1024) / ITEM_SIZE }; - -private: - MemPoolT( const MemPoolT& ); // not supported - void operator=( const MemPoolT& ); // not supported - - union Item { - Item* next; - char itemData[ITEM_SIZE]; - }; - struct Block { - Item items[ITEMS_PER_BLOCK]; - }; - DynArray< Block*, 10 > _blockPtrs; - Item* _root; - - int _currentAllocs; - int _nAllocs; - int _maxAllocs; - int _nUntracked; -}; - - - -/** - Implements the interface to the "Visitor pattern" (see the Accept() method.) - If you call the Accept() method, it requires being passed a XMLVisitor - class to handle callbacks. For nodes that contain other nodes (Document, Element) - you will get called with a VisitEnter/VisitExit pair. Nodes that are always leafs - are simply called with Visit(). - - If you return 'true' from a Visit method, recursive parsing will continue. If you return - false, no children of this node or its siblings will be visited. - - All flavors of Visit methods have a default implementation that returns 'true' (continue - visiting). You need to only override methods that are interesting to you. - - Generally Accept() is called on the XMLDocument, although all nodes support visiting. - - You should never change the document from a callback. - - @sa XMLNode::Accept() -*/ -class TINYXML2_LIB XMLVisitor -{ -public: - virtual ~XMLVisitor() {} - - /// Visit a document. - virtual bool VisitEnter( const XMLDocument& /*doc*/ ) { - return true; - } - /// Visit a document. - virtual bool VisitExit( const XMLDocument& /*doc*/ ) { - return true; - } - - /// Visit an element. - virtual bool VisitEnter( const XMLElement& /*element*/, const XMLAttribute* /*firstAttribute*/ ) { - return true; - } - /// Visit an element. - virtual bool VisitExit( const XMLElement& /*element*/ ) { - return true; - } - - /// Visit a declaration. - virtual bool Visit( const XMLDeclaration& /*declaration*/ ) { - return true; - } - /// Visit a text node. - virtual bool Visit( const XMLText& /*text*/ ) { - return true; - } - /// Visit a comment node. - virtual bool Visit( const XMLComment& /*comment*/ ) { - return true; - } - /// Visit an unknown node. - virtual bool Visit( const XMLUnknown& /*unknown*/ ) { - return true; - } -}; - -// WARNING: must match XMLDocument::_errorNames[] -enum XMLError { - XML_SUCCESS = 0, - XML_NO_ATTRIBUTE, - XML_WRONG_ATTRIBUTE_TYPE, - XML_ERROR_FILE_NOT_FOUND, - XML_ERROR_FILE_COULD_NOT_BE_OPENED, - XML_ERROR_FILE_READ_ERROR, - XML_ERROR_PARSING_ELEMENT, - XML_ERROR_PARSING_ATTRIBUTE, - XML_ERROR_PARSING_TEXT, - XML_ERROR_PARSING_CDATA, - XML_ERROR_PARSING_COMMENT, - XML_ERROR_PARSING_DECLARATION, - XML_ERROR_PARSING_UNKNOWN, - XML_ERROR_EMPTY_DOCUMENT, - XML_ERROR_MISMATCHED_ELEMENT, - XML_ERROR_PARSING, - XML_CAN_NOT_CONVERT_TEXT, - XML_NO_TEXT_NODE, - XML_ELEMENT_DEPTH_EXCEEDED, - - XML_ERROR_COUNT -}; - - -/* - Utility functionality. -*/ -class TINYXML2_LIB XMLUtil -{ -public: - static const char* SkipWhiteSpace( const char* p, int* curLineNumPtr ) { - TIXMLASSERT( p ); - - while( IsWhiteSpace(*p) ) { - if (curLineNumPtr && *p == '\n') { - ++(*curLineNumPtr); - } - ++p; - } - TIXMLASSERT( p ); - return p; - } - static char* SkipWhiteSpace( char* p, int* curLineNumPtr ) { - return const_cast( SkipWhiteSpace( const_cast(p), curLineNumPtr ) ); - } - - // Anything in the high order range of UTF-8 is assumed to not be whitespace. This isn't - // correct, but simple, and usually works. - static bool IsWhiteSpace( char p ) { - return !IsUTF8Continuation(p) && isspace( static_cast(p) ); - } - - inline static bool IsNameStartChar( unsigned char ch ) { - if ( ch >= 128 ) { - // This is a heuristic guess in attempt to not implement Unicode-aware isalpha() - return true; - } - if ( isalpha( ch ) ) { - return true; - } - return ch == ':' || ch == '_'; - } - - inline static bool IsNameChar( unsigned char ch ) { - return IsNameStartChar( ch ) - || isdigit( ch ) - || ch == '.' - || ch == '-'; - } - - inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX ) { - if ( p == q ) { - return true; - } - TIXMLASSERT( p ); - TIXMLASSERT( q ); - TIXMLASSERT( nChar >= 0 ); - return strncmp( p, q, nChar ) == 0; - } - - inline static bool IsUTF8Continuation( char p ) { - return ( p & 0x80 ) != 0; - } - - static const char* ReadBOM( const char* p, bool* hasBOM ); - // p is the starting location, - // the UTF-8 value of the entity will be placed in value, and length filled in. - static const char* GetCharacterRef( const char* p, char* value, int* length ); - static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length ); - - // converts primitive types to strings - static void ToStr( int v, char* buffer, int bufferSize ); - static void ToStr( unsigned v, char* buffer, int bufferSize ); - static void ToStr( bool v, char* buffer, int bufferSize ); - static void ToStr( float v, char* buffer, int bufferSize ); - static void ToStr( double v, char* buffer, int bufferSize ); - static void ToStr(int64_t v, char* buffer, int bufferSize); - - // converts strings to primitive types - static bool ToInt( const char* str, int* value ); - static bool ToUnsigned( const char* str, unsigned* value ); - static bool ToBool( const char* str, bool* value ); - static bool ToFloat( const char* str, float* value ); - static bool ToDouble( const char* str, double* value ); - static bool ToInt64(const char* str, int64_t* value); - - // Changes what is serialized for a boolean value. - // Default to "true" and "false". Shouldn't be changed - // unless you have a special testing or compatibility need. - // Be careful: static, global, & not thread safe. - // Be sure to set static const memory as parameters. - static void SetBoolSerialization(const char* writeTrue, const char* writeFalse); - -private: - static const char* writeBoolTrue; - static const char* writeBoolFalse; -}; - - -/** XMLNode is a base class for every object that is in the - XML Document Object Model (DOM), except XMLAttributes. - Nodes have siblings, a parent, and children which can - be navigated. A node is always in a XMLDocument. - The type of a XMLNode can be queried, and it can - be cast to its more defined type. - - A XMLDocument allocates memory for all its Nodes. - When the XMLDocument gets deleted, all its Nodes - will also be deleted. - - @verbatim - A Document can contain: Element (container or leaf) - Comment (leaf) - Unknown (leaf) - Declaration( leaf ) - - An Element can contain: Element (container or leaf) - Text (leaf) - Attributes (not on tree) - Comment (leaf) - Unknown (leaf) - - @endverbatim -*/ -class TINYXML2_LIB XMLNode -{ - friend class XMLDocument; - friend class XMLElement; -public: - - /// Get the XMLDocument that owns this XMLNode. - const XMLDocument* GetDocument() const { - TIXMLASSERT( _document ); - return _document; - } - /// Get the XMLDocument that owns this XMLNode. - XMLDocument* GetDocument() { - TIXMLASSERT( _document ); - return _document; - } - - /// Safely cast to an Element, or null. - virtual XMLElement* ToElement() { - return 0; - } - /// Safely cast to Text, or null. - virtual XMLText* ToText() { - return 0; - } - /// Safely cast to a Comment, or null. - virtual XMLComment* ToComment() { - return 0; - } - /// Safely cast to a Document, or null. - virtual XMLDocument* ToDocument() { - return 0; - } - /// Safely cast to a Declaration, or null. - virtual XMLDeclaration* ToDeclaration() { - return 0; - } - /// Safely cast to an Unknown, or null. - virtual XMLUnknown* ToUnknown() { - return 0; - } - - virtual const XMLElement* ToElement() const { - return 0; - } - virtual const XMLText* ToText() const { - return 0; - } - virtual const XMLComment* ToComment() const { - return 0; - } - virtual const XMLDocument* ToDocument() const { - return 0; - } - virtual const XMLDeclaration* ToDeclaration() const { - return 0; - } - virtual const XMLUnknown* ToUnknown() const { - return 0; - } - - /** The meaning of 'value' changes for the specific type. - @verbatim - Document: empty (NULL is returned, not an empty string) - Element: name of the element - Comment: the comment text - Unknown: the tag contents - Text: the text string - @endverbatim - */ - const char* Value() const; - - /** Set the Value of an XML node. - @sa Value() - */ - void SetValue( const char* val, bool staticMem=false ); - - /// Gets the line number the node is in, if the document was parsed from a file. - int GetLineNum() const { return _parseLineNum; } - - /// Get the parent of this node on the DOM. - const XMLNode* Parent() const { - return _parent; - } - - XMLNode* Parent() { - return _parent; - } - - /// Returns true if this node has no children. - bool NoChildren() const { - return !_firstChild; - } - - /// Get the first child node, or null if none exists. - const XMLNode* FirstChild() const { - return _firstChild; - } - - XMLNode* FirstChild() { - return _firstChild; - } - - /** Get the first child element, or optionally the first child - element with the specified name. - */ - const XMLElement* FirstChildElement( const char* name = 0 ) const; - - XMLElement* FirstChildElement( const char* name = 0 ) { - return const_cast(const_cast(this)->FirstChildElement( name )); - } - - /// Get the last child node, or null if none exists. - const XMLNode* LastChild() const { - return _lastChild; - } - - XMLNode* LastChild() { - return _lastChild; - } - - /** Get the last child element or optionally the last child - element with the specified name. - */ - const XMLElement* LastChildElement( const char* name = 0 ) const; - - XMLElement* LastChildElement( const char* name = 0 ) { - return const_cast(const_cast(this)->LastChildElement(name) ); - } - - /// Get the previous (left) sibling node of this node. - const XMLNode* PreviousSibling() const { - return _prev; - } - - XMLNode* PreviousSibling() { - return _prev; - } - - /// Get the previous (left) sibling element of this node, with an optionally supplied name. - const XMLElement* PreviousSiblingElement( const char* name = 0 ) const ; - - XMLElement* PreviousSiblingElement( const char* name = 0 ) { - return const_cast(const_cast(this)->PreviousSiblingElement( name ) ); - } - - /// Get the next (right) sibling node of this node. - const XMLNode* NextSibling() const { - return _next; - } - - XMLNode* NextSibling() { - return _next; - } - - /// Get the next (right) sibling element of this node, with an optionally supplied name. - const XMLElement* NextSiblingElement( const char* name = 0 ) const; - - XMLElement* NextSiblingElement( const char* name = 0 ) { - return const_cast(const_cast(this)->NextSiblingElement( name ) ); - } - - /** - Add a child node as the last (right) child. - If the child node is already part of the document, - it is moved from its old location to the new location. - Returns the addThis argument or 0 if the node does not - belong to the same document. - */ - XMLNode* InsertEndChild( XMLNode* addThis ); - - XMLNode* LinkEndChild( XMLNode* addThis ) { - return InsertEndChild( addThis ); - } - /** - Add a child node as the first (left) child. - If the child node is already part of the document, - it is moved from its old location to the new location. - Returns the addThis argument or 0 if the node does not - belong to the same document. - */ - XMLNode* InsertFirstChild( XMLNode* addThis ); - /** - Add a node after the specified child node. - If the child node is already part of the document, - it is moved from its old location to the new location. - Returns the addThis argument or 0 if the afterThis node - is not a child of this node, or if the node does not - belong to the same document. - */ - XMLNode* InsertAfterChild( XMLNode* afterThis, XMLNode* addThis ); - - /** - Delete all the children of this node. - */ - void DeleteChildren(); - - /** - Delete a child of this node. - */ - void DeleteChild( XMLNode* node ); - - /** - Make a copy of this node, but not its children. - You may pass in a Document pointer that will be - the owner of the new Node. If the 'document' is - null, then the node returned will be allocated - from the current Document. (this->GetDocument()) - - Note: if called on a XMLDocument, this will return null. - */ - virtual XMLNode* ShallowClone( XMLDocument* document ) const = 0; - - /** - Make a copy of this node and all its children. - - If the 'target' is null, then the nodes will - be allocated in the current document. If 'target' - is specified, the memory will be allocated is the - specified XMLDocument. - - NOTE: This is probably not the correct tool to - copy a document, since XMLDocuments can have multiple - top level XMLNodes. You probably want to use - XMLDocument::DeepCopy() - */ - XMLNode* DeepClone( XMLDocument* target ) const; - - /** - Test if 2 nodes are the same, but don't test children. - The 2 nodes do not need to be in the same Document. - - Note: if called on a XMLDocument, this will return false. - */ - virtual bool ShallowEqual( const XMLNode* compare ) const = 0; - - /** Accept a hierarchical visit of the nodes in the TinyXML-2 DOM. Every node in the - XML tree will be conditionally visited and the host will be called back - via the XMLVisitor interface. - - This is essentially a SAX interface for TinyXML-2. (Note however it doesn't re-parse - the XML for the callbacks, so the performance of TinyXML-2 is unchanged by using this - interface versus any other.) - - The interface has been based on ideas from: - - - http://www.saxproject.org/ - - http://c2.com/cgi/wiki?HierarchicalVisitorPattern - - Which are both good references for "visiting". - - An example of using Accept(): - @verbatim - XMLPrinter printer; - tinyxmlDoc.Accept( &printer ); - const char* xmlcstr = printer.CStr(); - @endverbatim - */ - virtual bool Accept( XMLVisitor* visitor ) const = 0; - - /** - Set user data into the XMLNode. TinyXML-2 in - no way processes or interprets user data. - It is initially 0. - */ - void SetUserData(void* userData) { _userData = userData; } - - /** - Get user data set into the XMLNode. TinyXML-2 in - no way processes or interprets user data. - It is initially 0. - */ - void* GetUserData() const { return _userData; } - -protected: - explicit XMLNode( XMLDocument* ); - virtual ~XMLNode(); - - virtual char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr); - - XMLDocument* _document; - XMLNode* _parent; - mutable StrPair _value; - int _parseLineNum; - - XMLNode* _firstChild; - XMLNode* _lastChild; - - XMLNode* _prev; - XMLNode* _next; - - void* _userData; - -private: - MemPool* _memPool; - void Unlink( XMLNode* child ); - static void DeleteNode( XMLNode* node ); - void InsertChildPreamble( XMLNode* insertThis ) const; - const XMLElement* ToElementWithName( const char* name ) const; - - XMLNode( const XMLNode& ); // not supported - XMLNode& operator=( const XMLNode& ); // not supported -}; - - -/** XML text. - - Note that a text node can have child element nodes, for example: - @verbatim - This is bold - @endverbatim - - A text node can have 2 ways to output the next. "normal" output - and CDATA. It will default to the mode it was parsed from the XML file and - you generally want to leave it alone, but you can change the output mode with - SetCData() and query it with CData(). -*/ -class TINYXML2_LIB XMLText : public XMLNode -{ - friend class XMLDocument; -public: - virtual bool Accept( XMLVisitor* visitor ) const; - - virtual XMLText* ToText() { - return this; - } - virtual const XMLText* ToText() const { - return this; - } - - /// Declare whether this should be CDATA or standard text. - void SetCData( bool isCData ) { - _isCData = isCData; - } - /// Returns true if this is a CDATA text element. - bool CData() const { - return _isCData; - } - - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - explicit XMLText( XMLDocument* doc ) : XMLNode( doc ), _isCData( false ) {} - virtual ~XMLText() {} - - char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); - -private: - bool _isCData; - - XMLText( const XMLText& ); // not supported - XMLText& operator=( const XMLText& ); // not supported -}; - - -/** An XML Comment. */ -class TINYXML2_LIB XMLComment : public XMLNode -{ - friend class XMLDocument; -public: - virtual XMLComment* ToComment() { - return this; - } - virtual const XMLComment* ToComment() const { - return this; - } - - virtual bool Accept( XMLVisitor* visitor ) const; - - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - explicit XMLComment( XMLDocument* doc ); - virtual ~XMLComment(); - - char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr); - -private: - XMLComment( const XMLComment& ); // not supported - XMLComment& operator=( const XMLComment& ); // not supported -}; - - -/** In correct XML the declaration is the first entry in the file. - @verbatim - - @endverbatim - - TinyXML-2 will happily read or write files without a declaration, - however. - - The text of the declaration isn't interpreted. It is parsed - and written as a string. -*/ -class TINYXML2_LIB XMLDeclaration : public XMLNode -{ - friend class XMLDocument; -public: - virtual XMLDeclaration* ToDeclaration() { - return this; - } - virtual const XMLDeclaration* ToDeclaration() const { - return this; - } - - virtual bool Accept( XMLVisitor* visitor ) const; - - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - explicit XMLDeclaration( XMLDocument* doc ); - virtual ~XMLDeclaration(); - - char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); - -private: - XMLDeclaration( const XMLDeclaration& ); // not supported - XMLDeclaration& operator=( const XMLDeclaration& ); // not supported -}; - - -/** Any tag that TinyXML-2 doesn't recognize is saved as an - unknown. It is a tag of text, but should not be modified. - It will be written back to the XML, unchanged, when the file - is saved. - - DTD tags get thrown into XMLUnknowns. -*/ -class TINYXML2_LIB XMLUnknown : public XMLNode -{ - friend class XMLDocument; -public: - virtual XMLUnknown* ToUnknown() { - return this; - } - virtual const XMLUnknown* ToUnknown() const { - return this; - } - - virtual bool Accept( XMLVisitor* visitor ) const; - - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - explicit XMLUnknown( XMLDocument* doc ); - virtual ~XMLUnknown(); - - char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); - -private: - XMLUnknown( const XMLUnknown& ); // not supported - XMLUnknown& operator=( const XMLUnknown& ); // not supported -}; - - - -/** An attribute is a name-value pair. Elements have an arbitrary - number of attributes, each with a unique name. - - @note The attributes are not XMLNodes. You may only query the - Next() attribute in a list. -*/ -class TINYXML2_LIB XMLAttribute -{ - friend class XMLElement; -public: - /// The name of the attribute. - const char* Name() const; - - /// The value of the attribute. - const char* Value() const; - - /// Gets the line number the attribute is in, if the document was parsed from a file. - int GetLineNum() const { return _parseLineNum; } - - /// The next attribute in the list. - const XMLAttribute* Next() const { - return _next; - } - - /** IntValue interprets the attribute as an integer, and returns the value. - If the value isn't an integer, 0 will be returned. There is no error checking; - use QueryIntValue() if you need error checking. - */ - int IntValue() const { - int i = 0; - QueryIntValue(&i); - return i; - } - - int64_t Int64Value() const { - int64_t i = 0; - QueryInt64Value(&i); - return i; - } - - /// Query as an unsigned integer. See IntValue() - unsigned UnsignedValue() const { - unsigned i=0; - QueryUnsignedValue( &i ); - return i; - } - /// Query as a boolean. See IntValue() - bool BoolValue() const { - bool b=false; - QueryBoolValue( &b ); - return b; - } - /// Query as a double. See IntValue() - double DoubleValue() const { - double d=0; - QueryDoubleValue( &d ); - return d; - } - /// Query as a float. See IntValue() - float FloatValue() const { - float f=0; - QueryFloatValue( &f ); - return f; - } - - /** QueryIntValue interprets the attribute as an integer, and returns the value - in the provided parameter. The function will return XML_SUCCESS on success, - and XML_WRONG_ATTRIBUTE_TYPE if the conversion is not successful. - */ - XMLError QueryIntValue( int* value ) const; - /// See QueryIntValue - XMLError QueryUnsignedValue( unsigned int* value ) const; - /// See QueryIntValue - XMLError QueryInt64Value(int64_t* value) const; - /// See QueryIntValue - XMLError QueryBoolValue( bool* value ) const; - /// See QueryIntValue - XMLError QueryDoubleValue( double* value ) const; - /// See QueryIntValue - XMLError QueryFloatValue( float* value ) const; - - /// Set the attribute to a string value. - void SetAttribute( const char* value ); - /// Set the attribute to value. - void SetAttribute( int value ); - /// Set the attribute to value. - void SetAttribute( unsigned value ); - /// Set the attribute to value. - void SetAttribute(int64_t value); - /// Set the attribute to value. - void SetAttribute( bool value ); - /// Set the attribute to value. - void SetAttribute( double value ); - /// Set the attribute to value. - void SetAttribute( float value ); - -private: - enum { BUF_SIZE = 200 }; - - XMLAttribute() : _name(), _value(),_parseLineNum( 0 ), _next( 0 ), _memPool( 0 ) {} - virtual ~XMLAttribute() {} - - XMLAttribute( const XMLAttribute& ); // not supported - void operator=( const XMLAttribute& ); // not supported - void SetName( const char* name ); - - char* ParseDeep( char* p, bool processEntities, int* curLineNumPtr ); - - mutable StrPair _name; - mutable StrPair _value; - int _parseLineNum; - XMLAttribute* _next; - MemPool* _memPool; -}; - - -/** The element is a container class. It has a value, the element name, - and can contain other elements, text, comments, and unknowns. - Elements also contain an arbitrary number of attributes. -*/ -class TINYXML2_LIB XMLElement : public XMLNode -{ - friend class XMLDocument; -public: - /// Get the name of an element (which is the Value() of the node.) - const char* Name() const { - return Value(); - } - /// Set the name of the element. - void SetName( const char* str, bool staticMem=false ) { - SetValue( str, staticMem ); - } - - virtual XMLElement* ToElement() { - return this; - } - virtual const XMLElement* ToElement() const { - return this; - } - virtual bool Accept( XMLVisitor* visitor ) const; - - /** Given an attribute name, Attribute() returns the value - for the attribute of that name, or null if none - exists. For example: - - @verbatim - const char* value = ele->Attribute( "foo" ); - @endverbatim - - The 'value' parameter is normally null. However, if specified, - the attribute will only be returned if the 'name' and 'value' - match. This allow you to write code: - - @verbatim - if ( ele->Attribute( "foo", "bar" ) ) callFooIsBar(); - @endverbatim - - rather than: - @verbatim - if ( ele->Attribute( "foo" ) ) { - if ( strcmp( ele->Attribute( "foo" ), "bar" ) == 0 ) callFooIsBar(); - } - @endverbatim - */ - const char* Attribute( const char* name, const char* value=0 ) const; - - /** Given an attribute name, IntAttribute() returns the value - of the attribute interpreted as an integer. The default - value will be returned if the attribute isn't present, - or if there is an error. (For a method with error - checking, see QueryIntAttribute()). - */ - int IntAttribute(const char* name, int defaultValue = 0) const; - /// See IntAttribute() - unsigned UnsignedAttribute(const char* name, unsigned defaultValue = 0) const; - /// See IntAttribute() - int64_t Int64Attribute(const char* name, int64_t defaultValue = 0) const; - /// See IntAttribute() - bool BoolAttribute(const char* name, bool defaultValue = false) const; - /// See IntAttribute() - double DoubleAttribute(const char* name, double defaultValue = 0) const; - /// See IntAttribute() - float FloatAttribute(const char* name, float defaultValue = 0) const; - - /** Given an attribute name, QueryIntAttribute() returns - XML_SUCCESS, XML_WRONG_ATTRIBUTE_TYPE if the conversion - can't be performed, or XML_NO_ATTRIBUTE if the attribute - doesn't exist. If successful, the result of the conversion - will be written to 'value'. If not successful, nothing will - be written to 'value'. This allows you to provide default - value: - - @verbatim - int value = 10; - QueryIntAttribute( "foo", &value ); // if "foo" isn't found, value will still be 10 - @endverbatim - */ - XMLError QueryIntAttribute( const char* name, int* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryIntValue( value ); - } - - /// See QueryIntAttribute() - XMLError QueryUnsignedAttribute( const char* name, unsigned int* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryUnsignedValue( value ); - } - - /// See QueryIntAttribute() - XMLError QueryInt64Attribute(const char* name, int64_t* value) const { - const XMLAttribute* a = FindAttribute(name); - if (!a) { - return XML_NO_ATTRIBUTE; - } - return a->QueryInt64Value(value); - } - - /// See QueryIntAttribute() - XMLError QueryBoolAttribute( const char* name, bool* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryBoolValue( value ); - } - /// See QueryIntAttribute() - XMLError QueryDoubleAttribute( const char* name, double* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryDoubleValue( value ); - } - /// See QueryIntAttribute() - XMLError QueryFloatAttribute( const char* name, float* value ) const { - const XMLAttribute* a = FindAttribute( name ); - if ( !a ) { - return XML_NO_ATTRIBUTE; - } - return a->QueryFloatValue( value ); - } - - /// See QueryIntAttribute() - XMLError QueryStringAttribute(const char* name, const char** value) const { - const XMLAttribute* a = FindAttribute(name); - if (!a) { - return XML_NO_ATTRIBUTE; - } - *value = a->Value(); - return XML_SUCCESS; - } - - - - /** Given an attribute name, QueryAttribute() returns - XML_SUCCESS, XML_WRONG_ATTRIBUTE_TYPE if the conversion - can't be performed, or XML_NO_ATTRIBUTE if the attribute - doesn't exist. It is overloaded for the primitive types, - and is a generally more convenient replacement of - QueryIntAttribute() and related functions. - - If successful, the result of the conversion - will be written to 'value'. If not successful, nothing will - be written to 'value'. This allows you to provide default - value: - - @verbatim - int value = 10; - QueryAttribute( "foo", &value ); // if "foo" isn't found, value will still be 10 - @endverbatim - */ - XMLError QueryAttribute( const char* name, int* value ) const { - return QueryIntAttribute( name, value ); - } - - XMLError QueryAttribute( const char* name, unsigned int* value ) const { - return QueryUnsignedAttribute( name, value ); - } - - XMLError QueryAttribute(const char* name, int64_t* value) const { - return QueryInt64Attribute(name, value); - } - - XMLError QueryAttribute( const char* name, bool* value ) const { - return QueryBoolAttribute( name, value ); - } - - XMLError QueryAttribute( const char* name, double* value ) const { - return QueryDoubleAttribute( name, value ); - } - - XMLError QueryAttribute( const char* name, float* value ) const { - return QueryFloatAttribute( name, value ); - } - - /// Sets the named attribute to value. - void SetAttribute( const char* name, const char* value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, int value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, unsigned value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - - /// Sets the named attribute to value. - void SetAttribute(const char* name, int64_t value) { - XMLAttribute* a = FindOrCreateAttribute(name); - a->SetAttribute(value); - } - - /// Sets the named attribute to value. - void SetAttribute( const char* name, bool value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, double value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - /// Sets the named attribute to value. - void SetAttribute( const char* name, float value ) { - XMLAttribute* a = FindOrCreateAttribute( name ); - a->SetAttribute( value ); - } - - /** - Delete an attribute. - */ - void DeleteAttribute( const char* name ); - - /// Return the first attribute in the list. - const XMLAttribute* FirstAttribute() const { - return _rootAttribute; - } - /// Query a specific attribute in the list. - const XMLAttribute* FindAttribute( const char* name ) const; - - /** Convenience function for easy access to the text inside an element. Although easy - and concise, GetText() is limited compared to getting the XMLText child - and accessing it directly. - - If the first child of 'this' is a XMLText, the GetText() - returns the character string of the Text node, else null is returned. - - This is a convenient method for getting the text of simple contained text: - @verbatim - This is text - const char* str = fooElement->GetText(); - @endverbatim - - 'str' will be a pointer to "This is text". - - Note that this function can be misleading. If the element foo was created from - this XML: - @verbatim - This is text - @endverbatim - - then the value of str would be null. The first child node isn't a text node, it is - another element. From this XML: - @verbatim - This is text - @endverbatim - GetText() will return "This is ". - */ - const char* GetText() const; - - /** Convenience function for easy access to the text inside an element. Although easy - and concise, SetText() is limited compared to creating an XMLText child - and mutating it directly. - - If the first child of 'this' is a XMLText, SetText() sets its value to - the given string, otherwise it will create a first child that is an XMLText. - - This is a convenient method for setting the text of simple contained text: - @verbatim - This is text - fooElement->SetText( "Hullaballoo!" ); - Hullaballoo! - @endverbatim - - Note that this function can be misleading. If the element foo was created from - this XML: - @verbatim - This is text - @endverbatim - - then it will not change "This is text", but rather prefix it with a text element: - @verbatim - Hullaballoo!This is text - @endverbatim - - For this XML: - @verbatim - - @endverbatim - SetText() will generate - @verbatim - Hullaballoo! - @endverbatim - */ - void SetText( const char* inText ); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( int value ); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( unsigned value ); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText(int64_t value); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( bool value ); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( double value ); - /// Convenience method for setting text inside an element. See SetText() for important limitations. - void SetText( float value ); - - /** - Convenience method to query the value of a child text node. This is probably best - shown by example. Given you have a document is this form: - @verbatim - - 1 - 1.4 - - @endverbatim - - The QueryIntText() and similar functions provide a safe and easier way to get to the - "value" of x and y. - - @verbatim - int x = 0; - float y = 0; // types of x and y are contrived for example - const XMLElement* xElement = pointElement->FirstChildElement( "x" ); - const XMLElement* yElement = pointElement->FirstChildElement( "y" ); - xElement->QueryIntText( &x ); - yElement->QueryFloatText( &y ); - @endverbatim - - @returns XML_SUCCESS (0) on success, XML_CAN_NOT_CONVERT_TEXT if the text cannot be converted - to the requested type, and XML_NO_TEXT_NODE if there is no child text to query. - - */ - XMLError QueryIntText( int* ival ) const; - /// See QueryIntText() - XMLError QueryUnsignedText( unsigned* uval ) const; - /// See QueryIntText() - XMLError QueryInt64Text(int64_t* uval) const; - /// See QueryIntText() - XMLError QueryBoolText( bool* bval ) const; - /// See QueryIntText() - XMLError QueryDoubleText( double* dval ) const; - /// See QueryIntText() - XMLError QueryFloatText( float* fval ) const; - - int IntText(int defaultValue = 0) const; - - /// See QueryIntText() - unsigned UnsignedText(unsigned defaultValue = 0) const; - /// See QueryIntText() - int64_t Int64Text(int64_t defaultValue = 0) const; - /// See QueryIntText() - bool BoolText(bool defaultValue = false) const; - /// See QueryIntText() - double DoubleText(double defaultValue = 0) const; - /// See QueryIntText() - float FloatText(float defaultValue = 0) const; - - // internal: - enum ElementClosingType { - OPEN, // - CLOSED, // - CLOSING // - }; - ElementClosingType ClosingType() const { - return _closingType; - } - virtual XMLNode* ShallowClone( XMLDocument* document ) const; - virtual bool ShallowEqual( const XMLNode* compare ) const; - -protected: - char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); - -private: - XMLElement( XMLDocument* doc ); - virtual ~XMLElement(); - XMLElement( const XMLElement& ); // not supported - void operator=( const XMLElement& ); // not supported - - XMLAttribute* FindOrCreateAttribute( const char* name ); - char* ParseAttributes( char* p, int* curLineNumPtr ); - static void DeleteAttribute( XMLAttribute* attribute ); - XMLAttribute* CreateAttribute(); - - enum { BUF_SIZE = 200 }; - ElementClosingType _closingType; - // The attribute list is ordered; there is no 'lastAttribute' - // because the list needs to be scanned for dupes before adding - // a new attribute. - XMLAttribute* _rootAttribute; -}; - - -enum Whitespace { - PRESERVE_WHITESPACE, - COLLAPSE_WHITESPACE -}; - - -/** A Document binds together all the functionality. - It can be saved, loaded, and printed to the screen. - All Nodes are connected and allocated to a Document. - If the Document is deleted, all its Nodes are also deleted. -*/ -class TINYXML2_LIB XMLDocument : public XMLNode -{ - friend class XMLElement; - // Gives access to SetError and Push/PopDepth, but over-access for everything else. - // Wishing C++ had "internal" scope. - friend class XMLNode; - friend class XMLText; - friend class XMLComment; - friend class XMLDeclaration; - friend class XMLUnknown; -public: - /// constructor - XMLDocument( bool processEntities = true, Whitespace whitespaceMode = PRESERVE_WHITESPACE ); - ~XMLDocument(); - - virtual XMLDocument* ToDocument() { - TIXMLASSERT( this == _document ); - return this; - } - virtual const XMLDocument* ToDocument() const { - TIXMLASSERT( this == _document ); - return this; - } - - /** - Parse an XML file from a character string. - Returns XML_SUCCESS (0) on success, or - an errorID. - - You may optionally pass in the 'nBytes', which is - the number of bytes which will be parsed. If not - specified, TinyXML-2 will assume 'xml' points to a - null terminated string. - */ - XMLError Parse( const char* xml, size_t nBytes=(size_t)(-1) ); - - /** - Load an XML file from disk. - Returns XML_SUCCESS (0) on success, or - an errorID. - */ - XMLError LoadFile( const char* filename ); - - /** - Load an XML file from disk. You are responsible - for providing and closing the FILE*. - - NOTE: The file should be opened as binary ("rb") - not text in order for TinyXML-2 to correctly - do newline normalization. - - Returns XML_SUCCESS (0) on success, or - an errorID. - */ - XMLError LoadFile( FILE* ); - - /** - Save the XML file to disk. - Returns XML_SUCCESS (0) on success, or - an errorID. - */ - XMLError SaveFile( const char* filename, bool compact = false ); - - /** - Save the XML file to disk. You are responsible - for providing and closing the FILE*. - - Returns XML_SUCCESS (0) on success, or - an errorID. - */ - XMLError SaveFile( FILE* fp, bool compact = false ); - - bool ProcessEntities() const { - return _processEntities; - } - Whitespace WhitespaceMode() const { - return _whitespaceMode; - } - - /** - Returns true if this document has a leading Byte Order Mark of UTF8. - */ - bool HasBOM() const { - return _writeBOM; - } - /** Sets whether to write the BOM when writing the file. - */ - void SetBOM( bool useBOM ) { - _writeBOM = useBOM; - } - - /** Return the root element of DOM. Equivalent to FirstChildElement(). - To get the first node, use FirstChild(). - */ - XMLElement* RootElement() { - return FirstChildElement(); - } - const XMLElement* RootElement() const { - return FirstChildElement(); - } - - /** Print the Document. If the Printer is not provided, it will - print to stdout. If you provide Printer, this can print to a file: - @verbatim - XMLPrinter printer( fp ); - doc.Print( &printer ); - @endverbatim - - Or you can use a printer to print to memory: - @verbatim - XMLPrinter printer; - doc.Print( &printer ); - // printer.CStr() has a const char* to the XML - @endverbatim - */ - void Print( XMLPrinter* streamer=0 ) const; - virtual bool Accept( XMLVisitor* visitor ) const; - - /** - Create a new Element associated with - this Document. The memory for the Element - is managed by the Document. - */ - XMLElement* NewElement( const char* name ); - /** - Create a new Comment associated with - this Document. The memory for the Comment - is managed by the Document. - */ - XMLComment* NewComment( const char* comment ); - /** - Create a new Text associated with - this Document. The memory for the Text - is managed by the Document. - */ - XMLText* NewText( const char* text ); - /** - Create a new Declaration associated with - this Document. The memory for the object - is managed by the Document. - - If the 'text' param is null, the standard - declaration is used.: - @verbatim - - @endverbatim - */ - XMLDeclaration* NewDeclaration( const char* text=0 ); - /** - Create a new Unknown associated with - this Document. The memory for the object - is managed by the Document. - */ - XMLUnknown* NewUnknown( const char* text ); - - /** - Delete a node associated with this document. - It will be unlinked from the DOM. - */ - void DeleteNode( XMLNode* node ); - - void ClearError() { - SetError(XML_SUCCESS, 0, 0); - } - - /// Return true if there was an error parsing the document. - bool Error() const { - return _errorID != XML_SUCCESS; - } - /// Return the errorID. - XMLError ErrorID() const { - return _errorID; - } - const char* ErrorName() const; - static const char* ErrorIDToName(XMLError errorID); - - /** Returns a "long form" error description. A hopefully helpful - diagnostic with location, line number, and/or additional info. - */ - const char* ErrorStr() const; - - /// A (trivial) utility function that prints the ErrorStr() to stdout. - void PrintError() const; - - /// Return the line where the error occurred, or zero if unknown. - int ErrorLineNum() const - { - return _errorLineNum; - } - - /// Clear the document, resetting it to the initial state. - void Clear(); - - /** - Copies this document to a target document. - The target will be completely cleared before the copy. - If you want to copy a sub-tree, see XMLNode::DeepClone(). - - NOTE: that the 'target' must be non-null. - */ - void DeepCopy(XMLDocument* target) const; - - // internal - char* Identify( char* p, XMLNode** node ); - - // internal - void MarkInUse(XMLNode*); - - virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const { - return 0; - } - virtual bool ShallowEqual( const XMLNode* /*compare*/ ) const { - return false; - } - -private: - XMLDocument( const XMLDocument& ); // not supported - void operator=( const XMLDocument& ); // not supported - - bool _writeBOM; - bool _processEntities; - XMLError _errorID; - Whitespace _whitespaceMode; - mutable StrPair _errorStr; - int _errorLineNum; - char* _charBuffer; - int _parseCurLineNum; - int _parsingDepth; - // Memory tracking does add some overhead. - // However, the code assumes that you don't - // have a bunch of unlinked nodes around. - // Therefore it takes less memory to track - // in the document vs. a linked list in the XMLNode, - // and the performance is the same. - DynArray _unlinked; - - MemPoolT< sizeof(XMLElement) > _elementPool; - MemPoolT< sizeof(XMLAttribute) > _attributePool; - MemPoolT< sizeof(XMLText) > _textPool; - MemPoolT< sizeof(XMLComment) > _commentPool; - - static const char* _errorNames[XML_ERROR_COUNT]; - - void Parse(); - - void SetError( XMLError error, int lineNum, const char* format, ... ); - - // Something of an obvious security hole, once it was discovered. - // Either an ill-formed XML or an excessively deep one can overflow - // the stack. Track stack depth, and error out if needed. - class DepthTracker { - public: - explicit DepthTracker(XMLDocument * document) { - this->_document = document; - document->PushDepth(); - } - ~DepthTracker() { - _document->PopDepth(); - } - private: - XMLDocument * _document; - }; - void PushDepth(); - void PopDepth(); - - template - NodeType* CreateUnlinkedNode( MemPoolT& pool ); -}; - -template -inline NodeType* XMLDocument::CreateUnlinkedNode( MemPoolT& pool ) -{ - TIXMLASSERT( sizeof( NodeType ) == PoolElementSize ); - TIXMLASSERT( sizeof( NodeType ) == pool.ItemSize() ); - NodeType* returnNode = new (pool.Alloc()) NodeType( this ); - TIXMLASSERT( returnNode ); - returnNode->_memPool = &pool; - - _unlinked.Push(returnNode); - return returnNode; -} - -/** - A XMLHandle is a class that wraps a node pointer with null checks; this is - an incredibly useful thing. Note that XMLHandle is not part of the TinyXML-2 - DOM structure. It is a separate utility class. - - Take an example: - @verbatim - - - - - - - @endverbatim - - Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very - easy to write a *lot* of code that looks like: - - @verbatim - XMLElement* root = document.FirstChildElement( "Document" ); - if ( root ) - { - XMLElement* element = root->FirstChildElement( "Element" ); - if ( element ) - { - XMLElement* child = element->FirstChildElement( "Child" ); - if ( child ) - { - XMLElement* child2 = child->NextSiblingElement( "Child" ); - if ( child2 ) - { - // Finally do something useful. - @endverbatim - - And that doesn't even cover "else" cases. XMLHandle addresses the verbosity - of such code. A XMLHandle checks for null pointers so it is perfectly safe - and correct to use: - - @verbatim - XMLHandle docHandle( &document ); - XMLElement* child2 = docHandle.FirstChildElement( "Document" ).FirstChildElement( "Element" ).FirstChildElement().NextSiblingElement(); - if ( child2 ) - { - // do something useful - @endverbatim - - Which is MUCH more concise and useful. - - It is also safe to copy handles - internally they are nothing more than node pointers. - @verbatim - XMLHandle handleCopy = handle; - @endverbatim - - See also XMLConstHandle, which is the same as XMLHandle, but operates on const objects. -*/ -class TINYXML2_LIB XMLHandle -{ -public: - /// Create a handle from any node (at any depth of the tree.) This can be a null pointer. - explicit XMLHandle( XMLNode* node ) : _node( node ) { - } - /// Create a handle from a node. - explicit XMLHandle( XMLNode& node ) : _node( &node ) { - } - /// Copy constructor - XMLHandle( const XMLHandle& ref ) : _node( ref._node ) { - } - /// Assignment - XMLHandle& operator=( const XMLHandle& ref ) { - _node = ref._node; - return *this; - } - - /// Get the first child of this handle. - XMLHandle FirstChild() { - return XMLHandle( _node ? _node->FirstChild() : 0 ); - } - /// Get the first child element of this handle. - XMLHandle FirstChildElement( const char* name = 0 ) { - return XMLHandle( _node ? _node->FirstChildElement( name ) : 0 ); - } - /// Get the last child of this handle. - XMLHandle LastChild() { - return XMLHandle( _node ? _node->LastChild() : 0 ); - } - /// Get the last child element of this handle. - XMLHandle LastChildElement( const char* name = 0 ) { - return XMLHandle( _node ? _node->LastChildElement( name ) : 0 ); - } - /// Get the previous sibling of this handle. - XMLHandle PreviousSibling() { - return XMLHandle( _node ? _node->PreviousSibling() : 0 ); - } - /// Get the previous sibling element of this handle. - XMLHandle PreviousSiblingElement( const char* name = 0 ) { - return XMLHandle( _node ? _node->PreviousSiblingElement( name ) : 0 ); - } - /// Get the next sibling of this handle. - XMLHandle NextSibling() { - return XMLHandle( _node ? _node->NextSibling() : 0 ); - } - /// Get the next sibling element of this handle. - XMLHandle NextSiblingElement( const char* name = 0 ) { - return XMLHandle( _node ? _node->NextSiblingElement( name ) : 0 ); - } - - /// Safe cast to XMLNode. This can return null. - XMLNode* ToNode() { - return _node; - } - /// Safe cast to XMLElement. This can return null. - XMLElement* ToElement() { - return ( _node ? _node->ToElement() : 0 ); - } - /// Safe cast to XMLText. This can return null. - XMLText* ToText() { - return ( _node ? _node->ToText() : 0 ); - } - /// Safe cast to XMLUnknown. This can return null. - XMLUnknown* ToUnknown() { - return ( _node ? _node->ToUnknown() : 0 ); - } - /// Safe cast to XMLDeclaration. This can return null. - XMLDeclaration* ToDeclaration() { - return ( _node ? _node->ToDeclaration() : 0 ); - } - -private: - XMLNode* _node; -}; - - -/** - A variant of the XMLHandle class for working with const XMLNodes and Documents. It is the - same in all regards, except for the 'const' qualifiers. See XMLHandle for API. -*/ -class TINYXML2_LIB XMLConstHandle -{ -public: - explicit XMLConstHandle( const XMLNode* node ) : _node( node ) { - } - explicit XMLConstHandle( const XMLNode& node ) : _node( &node ) { - } - XMLConstHandle( const XMLConstHandle& ref ) : _node( ref._node ) { - } - - XMLConstHandle& operator=( const XMLConstHandle& ref ) { - _node = ref._node; - return *this; - } - - const XMLConstHandle FirstChild() const { - return XMLConstHandle( _node ? _node->FirstChild() : 0 ); - } - const XMLConstHandle FirstChildElement( const char* name = 0 ) const { - return XMLConstHandle( _node ? _node->FirstChildElement( name ) : 0 ); - } - const XMLConstHandle LastChild() const { - return XMLConstHandle( _node ? _node->LastChild() : 0 ); - } - const XMLConstHandle LastChildElement( const char* name = 0 ) const { - return XMLConstHandle( _node ? _node->LastChildElement( name ) : 0 ); - } - const XMLConstHandle PreviousSibling() const { - return XMLConstHandle( _node ? _node->PreviousSibling() : 0 ); - } - const XMLConstHandle PreviousSiblingElement( const char* name = 0 ) const { - return XMLConstHandle( _node ? _node->PreviousSiblingElement( name ) : 0 ); - } - const XMLConstHandle NextSibling() const { - return XMLConstHandle( _node ? _node->NextSibling() : 0 ); - } - const XMLConstHandle NextSiblingElement( const char* name = 0 ) const { - return XMLConstHandle( _node ? _node->NextSiblingElement( name ) : 0 ); - } - - - const XMLNode* ToNode() const { - return _node; - } - const XMLElement* ToElement() const { - return ( _node ? _node->ToElement() : 0 ); - } - const XMLText* ToText() const { - return ( _node ? _node->ToText() : 0 ); - } - const XMLUnknown* ToUnknown() const { - return ( _node ? _node->ToUnknown() : 0 ); - } - const XMLDeclaration* ToDeclaration() const { - return ( _node ? _node->ToDeclaration() : 0 ); - } - -private: - const XMLNode* _node; -}; - - -/** - Printing functionality. The XMLPrinter gives you more - options than the XMLDocument::Print() method. - - It can: - -# Print to memory. - -# Print to a file you provide. - -# Print XML without a XMLDocument. - - Print to Memory - - @verbatim - XMLPrinter printer; - doc.Print( &printer ); - SomeFunction( printer.CStr() ); - @endverbatim - - Print to a File - - You provide the file pointer. - @verbatim - XMLPrinter printer( fp ); - doc.Print( &printer ); - @endverbatim - - Print without a XMLDocument - - When loading, an XML parser is very useful. However, sometimes - when saving, it just gets in the way. The code is often set up - for streaming, and constructing the DOM is just overhead. - - The Printer supports the streaming case. The following code - prints out a trivially simple XML file without ever creating - an XML document. - - @verbatim - XMLPrinter printer( fp ); - printer.OpenElement( "foo" ); - printer.PushAttribute( "foo", "bar" ); - printer.CloseElement(); - @endverbatim -*/ -class TINYXML2_LIB XMLPrinter : public XMLVisitor -{ -public: - /** Construct the printer. If the FILE* is specified, - this will print to the FILE. Else it will print - to memory, and the result is available in CStr(). - If 'compact' is set to true, then output is created - with only required whitespace and newlines. - */ - XMLPrinter( FILE* file=0, bool compact = false, int depth = 0 ); - virtual ~XMLPrinter() {} - - /** If streaming, write the BOM and declaration. */ - void PushHeader( bool writeBOM, bool writeDeclaration ); - /** If streaming, start writing an element. - The element must be closed with CloseElement() - */ - void OpenElement( const char* name, bool compactMode=false ); - /// If streaming, add an attribute to an open element. - void PushAttribute( const char* name, const char* value ); - void PushAttribute( const char* name, int value ); - void PushAttribute( const char* name, unsigned value ); - void PushAttribute(const char* name, int64_t value); - void PushAttribute( const char* name, bool value ); - void PushAttribute( const char* name, double value ); - /// If streaming, close the Element. - virtual void CloseElement( bool compactMode=false ); - - /// Add a text node. - void PushText( const char* text, bool cdata=false ); - /// Add a text node from an integer. - void PushText( int value ); - /// Add a text node from an unsigned. - void PushText( unsigned value ); - /// Add a text node from an unsigned. - void PushText(int64_t value); - /// Add a text node from a bool. - void PushText( bool value ); - /// Add a text node from a float. - void PushText( float value ); - /// Add a text node from a double. - void PushText( double value ); - - /// Add a comment - void PushComment( const char* comment ); - - void PushDeclaration( const char* value ); - void PushUnknown( const char* value ); - - virtual bool VisitEnter( const XMLDocument& /*doc*/ ); - virtual bool VisitExit( const XMLDocument& /*doc*/ ) { - return true; - } - - virtual bool VisitEnter( const XMLElement& element, const XMLAttribute* attribute ); - virtual bool VisitExit( const XMLElement& element ); - - virtual bool Visit( const XMLText& text ); - virtual bool Visit( const XMLComment& comment ); - virtual bool Visit( const XMLDeclaration& declaration ); - virtual bool Visit( const XMLUnknown& unknown ); - - /** - If in print to memory mode, return a pointer to - the XML file in memory. - */ - const char* CStr() const { - return _buffer.Mem(); - } - /** - If in print to memory mode, return the size - of the XML file in memory. (Note the size returned - includes the terminating null.) - */ - int CStrSize() const { - return _buffer.Size(); - } - /** - If in print to memory mode, reset the buffer to the - beginning. - */ - void ClearBuffer() { - _buffer.Clear(); - _buffer.Push(0); - _firstElement = true; - } - -protected: - virtual bool CompactMode( const XMLElement& ) { return _compactMode; } - - /** Prints out the space before an element. You may override to change - the space and tabs used. A PrintSpace() override should call Print(). - */ - virtual void PrintSpace( int depth ); - void Print( const char* format, ... ); - void Write( const char* data, size_t size ); - inline void Write( const char* data ) { Write( data, strlen( data ) ); } - void Putc( char ch ); - - void SealElementIfJustOpened(); - bool _elementJustOpened; - DynArray< const char*, 10 > _stack; - -private: - void PrintString( const char*, bool restrictedEntitySet ); // prints out, after detecting entities. - - bool _firstElement; - FILE* _fp; - int _depth; - int _textDepth; - bool _processEntities; - bool _compactMode; - - enum { - ENTITY_RANGE = 64, - BUF_SIZE = 200 - }; - bool _entityFlag[ENTITY_RANGE]; - bool _restrictedEntityFlag[ENTITY_RANGE]; - - DynArray< char, 20 > _buffer; - - // Prohibit cloning, intentionally not implemented - XMLPrinter( const XMLPrinter& ); - XMLPrinter& operator=( const XMLPrinter& ); -}; - - -} // tinyxml2 - -#if defined(_MSC_VER) -# pragma warning(pop) -#endif - -#endif // TINYXML2_INCLUDED diff --git a/docs/BUILDING.md b/docs/BUILDING.md index d6d061049..56ff9718f 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -48,6 +48,9 @@ cd Shipwright # If you need to regenerate the asset headers to check them into source & 'C:\Program Files\CMake\bin\cmake.exe' --build .\build\x64 --target ExtractAssetHeaders + +# If you need a newer soh.otr only +& 'C:\Program Files\CMake\bin\cmake.exe' --build .\build\x64 --target GenerateSohOtr ``` ### Developing SoH @@ -110,6 +113,9 @@ cmake --build build-cmake --target clean # If you need to regenerate the asset headers to check them into source cmake --build build-cmake --target ExtractAssetHeaders + +# If you need a newer soh.otr only +cmake --build build-cmake --target GenerateSohOtr ``` ### Generating a distributable @@ -157,6 +163,9 @@ cmake --build build-cmake --target clean # If you need to regenerate the asset headers to check them into source cmake --build build-cmake --target ExtractAssetHeaders + +# If you need a newer soh.otr only +cmake --build build-cmake --target GenerateSohOtr ``` ### Generating a distributable diff --git a/docs/GAME_CONTROLLER_DB.md b/docs/GAME_CONTROLLER_DB.md new file mode 100644 index 000000000..4728c8981 --- /dev/null +++ b/docs/GAME_CONTROLLER_DB.md @@ -0,0 +1,31 @@ +# SDL GameControllerDB + +The Ship of Harkinian utilizes a text file with SDL controller mappings for extended controller hardware support. +This file is pulled from https://github.com/gabomdq/SDL_GameControllerDB during the build process as [a part of CMakeLists.txt](https://github.com/HarbourMasters/Shipwright/blob/bb643661f62865dfc757c185d0daaebb32f2d53d/soh/CMakeLists.txt#L760). + +## Released versions + +| Release | sha | diff | +| - | - | - | +| Zhora Alfa 4.0.0 | [967daa8](https://github.com/gabomdq/SDL_GameControllerDB/tree/967daa8f89c48b01ed0f9c6a86ac849930442fc6) | | +| Zhora Bravo 4.0.1 | [ccac7cd](https://github.com/gabomdq/SDL_GameControllerDB/tree/ccac7cd97f445955d4437e21c5f82123d9b4349b) | [+1](https://github.com/gabomdq/SDL_GameControllerDB/compare/967daa8...ccac7cd) | +| Zhora Charlie 4.0.2 | [ff26eb0](https://github.com/gabomdq/SDL_GameControllerDB/tree/ff26eb04d0fe18356985d968119429d6012e7d75) | [+8/-3](https://github.com/gabomdq/SDL_GameControllerDB/compare/ccac7cd...ff26eb0) | +| Zhora Delta 4.0.3 | [ad02da5](https://github.com/gabomdq/SDL_GameControllerDB/tree/ad02da5a95ca8005f2c1facc11a5a52f8522f0ee) | [+4/-5](https://github.com/gabomdq/SDL_GameControllerDB/compare/ff26eb0...ad02da5) | +| Zohra Echo 4.0.4 | [c203690](https://github.com/gabomdq/SDL_GameControllerDB/tree/c203690b1e13980699802918d362cd9dadf89bd0) | [+8/-4](https://github.com/gabomdq/SDL_GameControllerDB/compare/ad02da5...c203690) | +| Zhora Foxtrot 4.0.5 | [9db8101](https://github.com/gabomdq/SDL_GameControllerDB/tree/9db8101a5780d1b0721bf6de385e6ffe0d07dfc7) | [+6](https://github.com/gabomdq/SDL_GameControllerDB/compare/c203690...9db8101) | +| Flynn Alfa 5.0.0 | [163cc5d](https://github.com/gabomdq/SDL_GameControllerDB/tree/163cc5d45e9fc2f1bb2b95ea7eee4bbc9a57955c) | [+29/-8](https://github.com/gabomdq/SDL_GameControllerDB/compare/9db8101...163cc5d) | +| Flynn Bravo 5.0.1 | [7efce7d](https://github.com/gabomdq/SDL_GameControllerDB/tree/7efce7d3f309ec1fa409b1af09153f9eb77fbedf) | [-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/163cc5d...7efce7d) | +| Flynn Charlie 5.0.2 | [e607703](https://github.com/gabomdq/SDL_GameControllerDB/tree/e607703392145343e8aca42be052121c0b7bd1c9) | [+40/-17](https://github.com/gabomdq/SDL_GameControllerDB/compare/7efce7d...e607703) | +| Bradley Alfa 5.1.0 | [2ba9676](https://github.com/gabomdq/SDL_GameControllerDB/tree/2ba96761af795c15e916cc97790b51e09dc0cd54) | [+1/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/e607703...2ba9676) | +| Bradley Charlie 5.1.2 | [4f5d1d4](https://github.com/gabomdq/SDL_GameControllerDB/tree/4f5d1d497985b75f4a83a5de46f596dc4d7f002e) | [+5/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/2ba9676...4f5d1d4) | +| Bradley Delta 5.1.3 | [9b73049](https://github.com/gabomdq/SDL_GameControllerDB/tree/9b73049ee62a2cc862d6ad94c2c777f2e8363a48) | [+4/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/4f5d1d4...9b73049) | +| Bradley Echo 5.1.4 | [6d3801f](https://github.com/gabomdq/SDL_GameControllerDB/tree/6d3801fcfe74b1989de96403b7b560eba72a175c) | [+56/-21](https://github.com/gabomdq/SDL_GameControllerDB/compare/9b73049...6d3801f) | +| Gibbs Alfa 6.0.0 | [0562b00](https://github.com/gabomdq/SDL_GameControllerDB/tree/0562b00eaf5c0308c49d329b79263d2dae1c3a85) | [+8/-2](https://github.com/gabomdq/SDL_GameControllerDB/compare/6d3801f...0562b00) | +| Khan Alfa 6.1.0 | [436c7e3](https://github.com/gabomdq/SDL_GameControllerDB/tree/436c7e3d54a57189ea0ab44d05f36b7cc7ea496c) | [+31/-16](https://github.com/gabomdq/SDL_GameControllerDB/compare/0562b00...436c7e3) | +| Khan Bravo 6.1.1 | [01cca2e](https://github.com/gabomdq/SDL_GameControllerDB/tree/01cca2e77f9bf9f1432be04f876f287eb78297fe) | [+23/-6](https://github.com/gabomdq/SDL_GameControllerDB/compare/436c7e3...01cca2e) | +| Khan Charlie 6.1.2 | [6852946](https://github.com/gabomdq/SDL_GameControllerDB/tree/6852946487534c69b7d228fd4eb8c87cf6966475) | [+25/-15](https://github.com/gabomdq/SDL_GameControllerDB/compare/01cca2e...6852946) | +| Spock Alfa 7.0.0 | [38bda81](https://github.com/gabomdq/SDL_GameControllerDB/tree/38bda816dc786f18493876f7bc30bc12dfd2636a) | [+15/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/6852946...38bda81) | +| Spock Bravo 7.0.1 | [228d980](https://github.com/gabomdq/SDL_GameControllerDB/tree/228d980d3d791e9df3b096472f6b97459f8709fe) | [+7/-3](https://github.com/gabomdq/SDL_GameControllerDB/compare/38bda81...228d980) | +| Spock Charlie 7.0.2 | [c5b4df0](https://github.com/gabomdq/SDL_GameControllerDB/tree/c5b4df0e1061175cb11e3ebbf8045178339864a5) | [+3](https://github.com/gabomdq/SDL_GameControllerDB/compare/228d980...c5b4df0) | +| Sulu Alfa 7.1.0 | [a2cf171](https://github.com/gabomdq/SDL_GameControllerDB/tree/a2cf1711b4ebc646a3814705d2fb6aac5707bcae) | [+4/-1](https://github.com/gabomdq/SDL_GameControllerDB/compare/c5b4df0...a2cf171) | +| Sulu Bravo 7.1.1 | [cc9f777](https://github.com/gabomdq/SDL_GameControllerDB/tree/cc9f777721f0cb30058d9eef52a295130b734a4a) | [+29/-9](https://github.com/gabomdq/SDL_GameControllerDB/compare/a2cf171...cc9f777) | diff --git a/docs/supportedHashes.json b/docs/supportedHashes.json index 70198f29f..587a64a55 100644 --- a/docs/supportedHashes.json +++ b/docs/supportedHashes.json @@ -1,4 +1,8 @@ [ + { + "name": "PAL 1.0", + "sha1": "328a1f1beba30ce5e178f031662019eb32c5f3b5" + }, { "name": "PAL 1.1", "sha1": "cfbb98d392e4a9d39da8285d10cbef3974c2f012" diff --git a/libultraship b/libultraship index ec44917cf..c75ff3653 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit ec44917cf5536c8c59aaa7865696926e0bec1ba0 +Subproject commit c75ff3653f699cb1a8c017b10e4b3986259d8cf0 diff --git a/scripts/linux/appimage/soh.sh b/scripts/linux/appimage/soh.sh.in similarity index 91% rename from scripts/linux/appimage/soh.sh rename to scripts/linux/appimage/soh.sh.in index b69490912..bfc3cfec6 100644 --- a/scripts/linux/appimage/soh.sh +++ b/scripts/linux/appimage/soh.sh.in @@ -26,7 +26,6 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do ln -s "$HERE"/usr/bin/{assets,soh.elf,ZAPD} "$ASSETDIR" export OLDPWD="$PWD" mkdir -p "$ASSETDIR"/tmp - mkdir -p "$ASSETDIR"/Extract ln -s "$romfile" "$ASSETDIR"/tmp/rom.z64 cd "$ASSETDIR" ROMHASH=$(sha1sum -b "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }') @@ -46,6 +45,12 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do d6342c59007e57c1194661ec6880b2f078403f4e) # n64 ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4 ;; + d0bdc2eb320668b4ba6893b9aefe4040a73123ff) # v64 + ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5 + ;; + 4946ab250f6ac9b32d76b21f309ebb8ebc8103d2) # n64 + ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5 + ;; 663c34f1b2c05a09e5beffe4d0dcd440f7d49dc7) # v64 ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012 ;; @@ -99,6 +104,14 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do continue fi ;; + 328a1f1beba30ce5e178f031662019eb32c5f3b5) + if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then + ROM=N64_PAL_10 + OTRNAME="oot.otr" + else + continue + fi + ;; cfbb98d392e4a9d39da8285d10cbef3974c2f012) if [[ ! -e "$SHIP_HOME"/oot.otr ]]; then ROM=N64_PAL_11 @@ -152,14 +165,13 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do continue;; esac if [[ ! -e "$SHIP_HOME"/"$OTRNAME" ]]; then - cp -r "$ASSETDIR"/assets/game "$ASSETDIR"/Extract/assets if [ -n "$ZENITY" ]; then (echo "# 25%"; echo "25"; sleep 2; echo "# 50%"; echo "50"; sleep 3; echo "# 75%"; echo "75"; sleep 2; echo "# 100%"; echo "100"; sleep 3) | zenity --progress --title="OTR Generating..." --timeout=10 --percentage=0 --icon-name=soh --window-icon=soh.png --height=80 --width=400 & 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 3c12c41a9..fd0c6ac25 100644 --- a/soh/CMakeLists.txt +++ b/soh/CMakeLists.txt @@ -754,6 +754,11 @@ endif() if (CMAKE_SYSTEM_NAME STREQUAL "Windows") 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.") @@ -761,6 +766,7 @@ execute_process(COMMAND ${CURL} -sSfL https://raw.githubusercontent.com/gabomdq/ 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/OTRExporter/assets/accessibility/texts/filechoose_eng.json b/soh/assets/custom/accessibility/texts/filechoose_eng.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/filechoose_eng.json rename to soh/assets/custom/accessibility/texts/filechoose_eng.json diff --git a/OTRExporter/assets/accessibility/texts/filechoose_fra.json b/soh/assets/custom/accessibility/texts/filechoose_fra.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/filechoose_fra.json rename to soh/assets/custom/accessibility/texts/filechoose_fra.json diff --git a/OTRExporter/assets/accessibility/texts/filechoose_ger.json b/soh/assets/custom/accessibility/texts/filechoose_ger.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/filechoose_ger.json rename to soh/assets/custom/accessibility/texts/filechoose_ger.json diff --git a/OTRExporter/assets/accessibility/texts/kaleidoscope_eng.json b/soh/assets/custom/accessibility/texts/kaleidoscope_eng.json similarity index 98% rename from OTRExporter/assets/accessibility/texts/kaleidoscope_eng.json rename to soh/assets/custom/accessibility/texts/kaleidoscope_eng.json index 10b016b32..a89c12889 100644 --- a/OTRExporter/assets/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/OTRExporter/assets/accessibility/texts/kaleidoscope_fra.json b/soh/assets/custom/accessibility/texts/kaleidoscope_fra.json similarity index 98% rename from OTRExporter/assets/accessibility/texts/kaleidoscope_fra.json rename to soh/assets/custom/accessibility/texts/kaleidoscope_fra.json index 820eb4cbc..116c19a41 100644 --- a/OTRExporter/assets/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/OTRExporter/assets/accessibility/texts/kaleidoscope_ger.json b/soh/assets/custom/accessibility/texts/kaleidoscope_ger.json similarity index 98% rename from OTRExporter/assets/accessibility/texts/kaleidoscope_ger.json rename to soh/assets/custom/accessibility/texts/kaleidoscope_ger.json index 630d933fc..649790da3 100644 --- a/OTRExporter/assets/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/OTRExporter/assets/accessibility/texts/misc_eng.json b/soh/assets/custom/accessibility/texts/misc_eng.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/misc_eng.json rename to soh/assets/custom/accessibility/texts/misc_eng.json diff --git a/OTRExporter/assets/accessibility/texts/misc_fra.json b/soh/assets/custom/accessibility/texts/misc_fra.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/misc_fra.json rename to soh/assets/custom/accessibility/texts/misc_fra.json diff --git a/OTRExporter/assets/accessibility/texts/misc_ger.json b/soh/assets/custom/accessibility/texts/misc_ger.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/misc_ger.json rename to soh/assets/custom/accessibility/texts/misc_ger.json diff --git a/OTRExporter/assets/accessibility/texts/scenes_eng.json b/soh/assets/custom/accessibility/texts/scenes_eng.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/scenes_eng.json rename to soh/assets/custom/accessibility/texts/scenes_eng.json diff --git a/OTRExporter/assets/accessibility/texts/scenes_fra.json b/soh/assets/custom/accessibility/texts/scenes_fra.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/scenes_fra.json rename to soh/assets/custom/accessibility/texts/scenes_fra.json diff --git a/OTRExporter/assets/accessibility/texts/scenes_ger.json b/soh/assets/custom/accessibility/texts/scenes_ger.json similarity index 100% rename from OTRExporter/assets/accessibility/texts/scenes_ger.json rename to soh/assets/custom/accessibility/texts/scenes_ger.json diff --git a/OTRExporter/assets/fonts/Fipps-Regular.otf b/soh/assets/custom/fonts/Fipps-Regular.otf similarity index 100% rename from OTRExporter/assets/fonts/Fipps-Regular.otf rename to soh/assets/custom/fonts/Fipps-Regular.otf diff --git a/OTRExporter/assets/fonts/PressStart2P-Regular.ttf b/soh/assets/custom/fonts/PressStart2P-Regular.ttf similarity index 100% rename from OTRExporter/assets/fonts/PressStart2P-Regular.ttf rename to soh/assets/custom/fonts/PressStart2P-Regular.ttf diff --git a/OTRExporter/assets/helpers/cosmetics/gEndGrayscaleAndEndDlistDL b/soh/assets/custom/helpers/cosmetics/gEndGrayscaleAndEndDlistDL similarity index 100% rename from OTRExporter/assets/helpers/cosmetics/gEndGrayscaleAndEndDlistDL rename to soh/assets/custom/helpers/cosmetics/gEndGrayscaleAndEndDlistDL diff --git a/OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gChristmasGreenTreasureChestFrontTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gChristmasGreenTreasureChestSideAndTopTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gChristmasRedTreasureChestFrontTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestSideAndTopTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gChristmasRedTreasureChestSideAndTopTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gChristmasRedTreasureChestSideAndTopTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gChristmasRedTreasureChestSideAndTopTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gGoldTreasureChestFrontTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gGoldTreasureChestSideAndTopTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gKeyTreasureChestFrontTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gKeyTreasureChestFrontTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gKeyTreasureChestFrontTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gKeyTreasureChestFrontTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gKeyTreasureChestSideAndTopTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gSkullTreasureChestFrontTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png b/soh/assets/custom/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png similarity index 100% rename from OTRExporter/assets/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png rename to soh/assets/custom/objects/object_box/gSkullTreasureChestSideAndTopTex.rgb5a1.png diff --git a/OTRExporter/assets/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png b/soh/assets/custom/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png similarity index 100% rename from OTRExporter/assets/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png rename to soh/assets/custom/objects/object_mag/gTitleBossRushSubtitleTex.rgba32.png diff --git a/OTRExporter/assets/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png b/soh/assets/custom/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png similarity index 100% rename from OTRExporter/assets/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png rename to soh/assets/custom/objects/object_mag/gTitleRandomizerSubtitleTex.rgba32.png diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL rename to soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 rename to soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 rename to soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 rename to soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 diff --git a/OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 rename to soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 diff --git a/OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges b/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges rename to soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges diff --git a/OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface rename to soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface diff --git a/OTRExporter/assets/objects/object_triforce_completed/noise_tex b/soh/assets/custom/objects/object_triforce_completed/noise_tex similarity index 100% rename from OTRExporter/assets/objects/object_triforce_completed/noise_tex rename to soh/assets/custom/objects/object_triforce_completed/noise_tex diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 rename to soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge rename to soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges rename to soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface rename to soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface diff --git a/OTRExporter/assets/objects/object_triforce_piece_0/noise_tex b/soh/assets/custom/objects/object_triforce_piece_0/noise_tex similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_0/noise_tex rename to soh/assets/custom/objects/object_triforce_piece_0/noise_tex diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL rename to soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 rename to soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 rename to soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 rename to soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 rename to soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge b/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge rename to soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface rename to soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface diff --git a/OTRExporter/assets/objects/object_triforce_piece_1/noise_tex b/soh/assets/custom/objects/object_triforce_piece_1/noise_tex similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_1/noise_tex rename to soh/assets/custom/objects/object_triforce_piece_1/noise_tex diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 rename to soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge rename to soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges rename to soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface rename to soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface diff --git a/OTRExporter/assets/objects/object_triforce_piece_2/noise_tex b/soh/assets/custom/objects/object_triforce_piece_2/noise_tex similarity index 100% rename from OTRExporter/assets/objects/object_triforce_piece_2/noise_tex rename to soh/assets/custom/objects/object_triforce_piece_2/noise_tex diff --git a/OTRExporter/assets/scenes/nonmq/syotes_scene/syotes_room_0 b/soh/assets/custom/scenes/nonmq/syotes_scene/syotes_room_0 similarity index 100% rename from OTRExporter/assets/scenes/nonmq/syotes_scene/syotes_room_0 rename to soh/assets/custom/scenes/nonmq/syotes_scene/syotes_room_0 diff --git a/OTRExporter/assets/textures/buttons/ABtn.png b/soh/assets/custom/textures/buttons/ABtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/ABtn.png rename to soh/assets/custom/textures/buttons/ABtn.png diff --git a/OTRExporter/assets/textures/buttons/BBtn.png b/soh/assets/custom/textures/buttons/BBtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/BBtn.png rename to soh/assets/custom/textures/buttons/BBtn.png diff --git a/OTRExporter/assets/textures/buttons/CDown.png b/soh/assets/custom/textures/buttons/CDown.png similarity index 100% rename from OTRExporter/assets/textures/buttons/CDown.png rename to soh/assets/custom/textures/buttons/CDown.png diff --git a/OTRExporter/assets/textures/buttons/CLeft.png b/soh/assets/custom/textures/buttons/CLeft.png similarity index 100% rename from OTRExporter/assets/textures/buttons/CLeft.png rename to soh/assets/custom/textures/buttons/CLeft.png diff --git a/OTRExporter/assets/textures/buttons/CRight.png b/soh/assets/custom/textures/buttons/CRight.png similarity index 100% rename from OTRExporter/assets/textures/buttons/CRight.png rename to soh/assets/custom/textures/buttons/CRight.png diff --git a/OTRExporter/assets/textures/buttons/CUp.png b/soh/assets/custom/textures/buttons/CUp.png similarity index 100% rename from OTRExporter/assets/textures/buttons/CUp.png rename to soh/assets/custom/textures/buttons/CUp.png diff --git a/OTRExporter/assets/textures/buttons/LBtn.png b/soh/assets/custom/textures/buttons/LBtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/LBtn.png rename to soh/assets/custom/textures/buttons/LBtn.png diff --git a/OTRExporter/assets/textures/buttons/RBtn.png b/soh/assets/custom/textures/buttons/RBtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/RBtn.png rename to soh/assets/custom/textures/buttons/RBtn.png diff --git a/OTRExporter/assets/textures/buttons/StartBtn.png b/soh/assets/custom/textures/buttons/StartBtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/StartBtn.png rename to soh/assets/custom/textures/buttons/StartBtn.png diff --git a/OTRExporter/assets/textures/buttons/ZBtn.png b/soh/assets/custom/textures/buttons/ZBtn.png similarity index 100% rename from OTRExporter/assets/textures/buttons/ZBtn.png rename to soh/assets/custom/textures/buttons/ZBtn.png diff --git a/OTRExporter/assets/textures/icons/gIcon.png b/soh/assets/custom/textures/icons/gIcon.png similarity index 100% rename from OTRExporter/assets/textures/icons/gIcon.png rename to soh/assets/custom/textures/icons/gIcon.png diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/SoHShiny b/soh/assets/custom/textures/nintendo_rogo_static/SoHShiny similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/SoHShiny rename to soh/assets/custom/textures/nintendo_rogo_static/SoHShiny diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_0 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_0 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_0 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_0 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_1 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_1 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_1 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_1 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_2 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_2 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_2 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_2 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_3 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_3 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_tri_3 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_tri_3 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_0 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_1 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_2 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 b/soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 rename to soh/assets/custom/textures/nintendo_rogo_static/gShipLogoDL_vtx_3 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material b/soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material rename to soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 b/soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_001 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 b/soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_002 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 b/soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_gShipLogoDL_f3d_material_003 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material b/soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material rename to soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 b/soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_001 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 b/soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_002 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 b/soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 rename to soh/assets/custom/textures/nintendo_rogo_static/mat_revert_gShipLogoDL_f3d_material_003 diff --git a/OTRExporter/assets/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 b/soh/assets/custom/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 similarity index 100% rename from OTRExporter/assets/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 rename to soh/assets/custom/textures/nintendo_rogo_static/nintendo_rogo_static_Tex_LUS_000000 diff --git a/OTRExporter/assets/textures/parameter_static/gArrowDown.ia16.png b/soh/assets/custom/textures/parameter_static/gArrowDown.ia16.png similarity index 100% rename from OTRExporter/assets/textures/parameter_static/gArrowDown.ia16.png rename to soh/assets/custom/textures/parameter_static/gArrowDown.ia16.png diff --git a/OTRExporter/assets/textures/parameter_static/gArrowUp.ia16.png b/soh/assets/custom/textures/parameter_static/gArrowUp.ia16.png similarity index 100% rename from OTRExporter/assets/textures/parameter_static/gArrowUp.ia16.png rename to soh/assets/custom/textures/parameter_static/gArrowUp.ia16.png diff --git a/OTRExporter/assets/textures/parameter_static/gDPad.ia16.png b/soh/assets/custom/textures/parameter_static/gDPad.ia16.png similarity index 100% rename from OTRExporter/assets/textures/parameter_static/gDPad.ia16.png rename to soh/assets/custom/textures/parameter_static/gDPad.ia16.png diff --git a/OTRExporter/assets/textures/parameter_static/gTriforcePiece.rgba32.png b/soh/assets/custom/textures/parameter_static/gTriforcePiece.rgba32.png similarity index 100% rename from OTRExporter/assets/textures/parameter_static/gTriforcePiece.rgba32.png rename to soh/assets/custom/textures/parameter_static/gTriforcePiece.rgba32.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelBossRushSettingsENGTex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelBossRushSettingsFRATex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelBossRushSettingsGERTex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelMQButtonTex.ia16.png b/soh/assets/custom/textures/title_static/gFileSelMQButtonTex.ia16.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelMQButtonTex.ia16.png rename to soh/assets/custom/textures/title_static/gFileSelMQButtonTex.ia16.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestENGTex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestFRATex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png b/soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png rename to soh/assets/custom/textures/title_static/gFileSelPleaseChooseAQuestGERTex.ia8.png diff --git a/OTRExporter/assets/textures/title_static/gFileSelRANDButtonTex.ia16.png b/soh/assets/custom/textures/title_static/gFileSelRANDButtonTex.ia16.png similarity index 100% rename from OTRExporter/assets/textures/title_static/gFileSelRANDButtonTex.ia16.png rename to soh/assets/custom/textures/title_static/gFileSelRANDButtonTex.ia16.png diff --git a/OTRExporter/assets/textures/virtual/gEmptyTexture.rgba32.png b/soh/assets/custom/textures/virtual/gEmptyTexture.rgba32.png similarity index 100% rename from OTRExporter/assets/textures/virtual/gEmptyTexture.rgba32.png rename to soh/assets/custom/textures/virtual/gEmptyTexture.rgba32.png diff --git a/soh/assets/extractor/Config_N64_PAL_10.xml b/soh/assets/extractor/Config_N64_PAL_10.xml new file mode 100644 index 000000000..e4f85e362 --- /dev/null +++ b/soh/assets/extractor/Config_N64_PAL_10.xml @@ -0,0 +1,8 @@ + + + + + + + + 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 084225d14..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 dgLinkAdultHookshotRedicleVtx "__OTR__objects/object_link_boy/gLinkAdultHookshotRedicleVtx" -static const ALIGN_ASSET(2) char gLinkAdultHookshotRedicleVtx[] = dgLinkAdultHookshotRedicleVtx; - #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_link_boy.xml b/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml index 8500b975b..60b9e0984 100644 --- a/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml b/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml index 02075c999..6351af505 100644 --- a/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_MQ_PAL_F/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/code/fbdemo_triforce.xml b/soh/assets/xml/GC_NMQ_D/code/fbdemo_triforce.xml index a20e07075..9f39f4df9 100644 --- a/soh/assets/xml/GC_NMQ_D/code/fbdemo_triforce.xml +++ b/soh/assets/xml/GC_NMQ_D/code/fbdemo_triforce.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml index 7c0014699..5342d5271 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/objects/object_md.xml b/soh/assets/xml/GC_NMQ_D/objects/object_md.xml index 85e70d8eb..717443537 100644 --- a/soh/assets/xml/GC_NMQ_D/objects/object_md.xml +++ b/soh/assets/xml/GC_NMQ_D/objects/object_md.xml @@ -53,7 +53,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml index 4e3b2de5d..efc258a68 100644 --- a/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/GC_NMQ_D/overlays/ovl_Boss_Ganon.xml @@ -29,7 +29,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml index 5eeac3773..05633e53e 100644 --- a/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml +++ b/soh/assets/xml/GC_NMQ_D/scenes/dungeons/ddan_boss.xml @@ -16,7 +16,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_D/textures/do_action_static.xml b/soh/assets/xml/GC_NMQ_D/textures/do_action_static.xml index 9ae8d9815..2cbd613b3 100644 --- a/soh/assets/xml/GC_NMQ_D/textures/do_action_static.xml +++ b/soh/assets/xml/GC_NMQ_D/textures/do_action_static.xml @@ -10,7 +10,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml index 02075c999..6351af505 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_md.xml b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_md.xml index 0c80fb780..161c73dca 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/objects/object_md.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/objects/object_md.xml @@ -53,7 +53,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml index 841bd7c2a..3b4e21d32 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml @@ -29,7 +29,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml index 823c6b0f2..23369b37d 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml @@ -71,6 +71,6 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml index 5eeac3773..05633e53e 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/scenes/dungeons/ddan_boss.xml @@ -16,7 +16,7 @@ - + diff --git a/soh/assets/xml/GC_NMQ_PAL_F/textures/do_action_static.xml b/soh/assets/xml/GC_NMQ_PAL_F/textures/do_action_static.xml index 9ae8d9815..2cbd613b3 100644 --- a/soh/assets/xml/GC_NMQ_PAL_F/textures/do_action_static.xml +++ b/soh/assets/xml/GC_NMQ_PAL_F/textures/do_action_static.xml @@ -10,7 +10,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_10/audio/Audio.xml b/soh/assets/xml/N64_PAL_10/audio/Audio.xml new file mode 100644 index 000000000..b2e32ab26 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/audio/Audio.xml @@ -0,0 +1,1558 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/code/fbdemo_circle.xml b/soh/assets/xml/N64_PAL_10/code/fbdemo_circle.xml new file mode 100644 index 000000000..f3f5a04f2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/code/fbdemo_circle.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/code/fbdemo_triforce.xml b/soh/assets/xml/N64_PAL_10/code/fbdemo_triforce.xml new file mode 100644 index 000000000..851f06884 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/code/fbdemo_triforce.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/code/fbdemo_wipe1.xml b/soh/assets/xml/N64_PAL_10/code/fbdemo_wipe1.xml new file mode 100644 index 000000000..d4783fee2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/code/fbdemo_wipe1.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/misc/link_animetion.xml b/soh/assets/xml/N64_PAL_10/misc/link_animetion.xml new file mode 100644 index 000000000..9de1e92d3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/misc/link_animetion.xml @@ -0,0 +1,577 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/gameplay_dangeon_keep.xml b/soh/assets/xml/N64_PAL_10/objects/gameplay_dangeon_keep.xml new file mode 100644 index 000000000..5b1a9050d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/gameplay_dangeon_keep.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/gameplay_field_keep.xml b/soh/assets/xml/N64_PAL_10/objects/gameplay_field_keep.xml new file mode 100644 index 000000000..011e8f7fc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/gameplay_field_keep.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/gameplay_keep.xml b/soh/assets/xml/N64_PAL_10/objects/gameplay_keep.xml new file mode 100644 index 000000000..5ffc52f65 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/gameplay_keep.xml @@ -0,0 +1,973 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_Bb.xml b/soh/assets/xml/N64_PAL_10/objects/object_Bb.xml new file mode 100644 index 000000000..5d04bde45 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_Bb.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ahg.xml b/soh/assets/xml/N64_PAL_10/objects/object_ahg.xml new file mode 100644 index 000000000..4d37b1b11 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ahg.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_am.xml b/soh/assets/xml/N64_PAL_10/objects/object_am.xml new file mode 100644 index 000000000..b70c70d70 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_am.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ane.xml b/soh/assets/xml/N64_PAL_10/objects/object_ane.xml new file mode 100644 index 000000000..1e29b351e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ane.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ani.xml b/soh/assets/xml/N64_PAL_10/objects/object_ani.xml new file mode 100644 index 000000000..c70621c6f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ani.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_anubice.xml b/soh/assets/xml/N64_PAL_10/objects/object_anubice.xml new file mode 100644 index 000000000..fb029586b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_anubice.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_aob.xml b/soh/assets/xml/N64_PAL_10/objects/object_aob.xml new file mode 100644 index 000000000..e6202d0cf --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_aob.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_b_heart.xml b/soh/assets/xml/N64_PAL_10/objects/object_b_heart.xml new file mode 100644 index 000000000..00f7cd677 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_b_heart.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bba.xml b/soh/assets/xml/N64_PAL_10/objects/object_bba.xml new file mode 100644 index 000000000..ccc5c2136 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bba.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bdan_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_bdan_objects.xml new file mode 100644 index 000000000..dcd56d385 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bdan_objects.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bdoor.xml b/soh/assets/xml/N64_PAL_10/objects/object_bdoor.xml new file mode 100644 index 000000000..a092f0c23 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bdoor.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bg.xml b/soh/assets/xml/N64_PAL_10/objects/object_bg.xml new file mode 100644 index 000000000..791226b71 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bg.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bigokuta.xml b/soh/assets/xml/N64_PAL_10/objects/object_bigokuta.xml new file mode 100644 index 000000000..1c7d39e31 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bigokuta.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bird.xml b/soh/assets/xml/N64_PAL_10/objects/object_bird.xml new file mode 100644 index 000000000..167a5022d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bird.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bji.xml b/soh/assets/xml/N64_PAL_10/objects/object_bji.xml new file mode 100644 index 000000000..c665b6b00 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bji.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bl.xml b/soh/assets/xml/N64_PAL_10/objects/object_bl.xml new file mode 100644 index 000000000..1c2ef4ec6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bl.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_blkobj.xml b/soh/assets/xml/N64_PAL_10/objects/object_blkobj.xml new file mode 100644 index 000000000..345a8ebd9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_blkobj.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bob.xml b/soh/assets/xml/N64_PAL_10/objects/object_bob.xml new file mode 100644 index 000000000..289e994e4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bob.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_boj.xml b/soh/assets/xml/N64_PAL_10/objects/object_boj.xml new file mode 100644 index 000000000..4be4764ab --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_boj.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bombf.xml b/soh/assets/xml/N64_PAL_10/objects/object_bombf.xml new file mode 100644 index 000000000..83e60248d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bombf.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bombiwa.xml b/soh/assets/xml/N64_PAL_10/objects/object_bombiwa.xml new file mode 100644 index 000000000..26ab6b4f3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bombiwa.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bowl.xml b/soh/assets/xml/N64_PAL_10/objects/object_bowl.xml new file mode 100644 index 000000000..ffe6d43db --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bowl.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_box.xml b/soh/assets/xml/N64_PAL_10/objects/object_box.xml new file mode 100644 index 000000000..106d2d335 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_box.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_brob.xml b/soh/assets/xml/N64_PAL_10/objects/object_brob.xml new file mode 100644 index 000000000..718dcd561 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_brob.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bubble.xml b/soh/assets/xml/N64_PAL_10/objects/object_bubble.xml new file mode 100644 index 000000000..f5de18692 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bubble.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bv.xml b/soh/assets/xml/N64_PAL_10/objects/object_bv.xml new file mode 100644 index 000000000..f8ffddaee --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bv.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bw.xml b/soh/assets/xml/N64_PAL_10/objects/object_bw.xml new file mode 100644 index 000000000..6fd39fbb1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bw.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bwall.xml b/soh/assets/xml/N64_PAL_10/objects/object_bwall.xml new file mode 100644 index 000000000..d4f43ddc1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bwall.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_bxa.xml b/soh/assets/xml/N64_PAL_10/objects/object_bxa.xml new file mode 100644 index 000000000..fb78c117e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_bxa.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_cne.xml b/soh/assets/xml/N64_PAL_10/objects/object_cne.xml new file mode 100644 index 000000000..0c14d0bc5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_cne.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_cob.xml b/soh/assets/xml/N64_PAL_10/objects/object_cob.xml new file mode 100644 index 000000000..ba051cfa7 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_cob.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_cow.xml b/soh/assets/xml/N64_PAL_10/objects/object_cow.xml new file mode 100644 index 000000000..5d067c329 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_cow.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_crow.xml b/soh/assets/xml/N64_PAL_10/objects/object_crow.xml new file mode 100644 index 000000000..77337c644 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_crow.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_cs.xml b/soh/assets/xml/N64_PAL_10/objects/object_cs.xml new file mode 100644 index 000000000..83804ccaf --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_cs.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_d_elevator.xml b/soh/assets/xml/N64_PAL_10/objects/object_d_elevator.xml new file mode 100644 index 000000000..6be59c154 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_d_elevator.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_d_hsblock.xml b/soh/assets/xml/N64_PAL_10/objects/object_d_hsblock.xml new file mode 100644 index 000000000..4bb50c2b4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_d_hsblock.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_d_lift.xml b/soh/assets/xml/N64_PAL_10/objects/object_d_lift.xml new file mode 100644 index 000000000..291238519 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_d_lift.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_daiku.xml b/soh/assets/xml/N64_PAL_10/objects/object_daiku.xml new file mode 100644 index 000000000..1524c7a26 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_daiku.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ddan_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_ddan_objects.xml new file mode 100644 index 000000000..3fc563b96 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ddan_objects.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dekubaba.xml b/soh/assets/xml/N64_PAL_10/objects/object_dekubaba.xml new file mode 100644 index 000000000..7202a833f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dekubaba.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dekujr.xml b/soh/assets/xml/N64_PAL_10/objects/object_dekujr.xml new file mode 100644 index 000000000..e906bf61c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dekujr.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dekunuts.xml b/soh/assets/xml/N64_PAL_10/objects/object_dekunuts.xml new file mode 100644 index 000000000..5fceef416 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dekunuts.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_demo_6k.xml b/soh/assets/xml/N64_PAL_10/objects/object_demo_6k.xml new file mode 100644 index 000000000..73058d5e4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_demo_6k.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_demo_kekkai.xml b/soh/assets/xml/N64_PAL_10/objects/object_demo_kekkai.xml new file mode 100644 index 000000000..aa54bc2ee --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_demo_kekkai.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_demo_tre_lgt.xml b/soh/assets/xml/N64_PAL_10/objects/object_demo_tre_lgt.xml new file mode 100644 index 000000000..9ea19012b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_demo_tre_lgt.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dh.xml b/soh/assets/xml/N64_PAL_10/objects/object_dh.xml new file mode 100644 index 000000000..7a52d7dbe --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dh.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dnk.xml b/soh/assets/xml/N64_PAL_10/objects/object_dnk.xml new file mode 100644 index 000000000..3bce34304 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dnk.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dns.xml b/soh/assets/xml/N64_PAL_10/objects/object_dns.xml new file mode 100644 index 000000000..8b78ffcf2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dns.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dodojr.xml b/soh/assets/xml/N64_PAL_10/objects/object_dodojr.xml new file mode 100644 index 000000000..4dfd7d6e4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dodojr.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dodongo.xml b/soh/assets/xml/N64_PAL_10/objects/object_dodongo.xml new file mode 100644 index 000000000..779e20e9d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dodongo.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dog.xml b/soh/assets/xml/N64_PAL_10/objects/object_dog.xml new file mode 100644 index 000000000..ef00442b6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dog.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_door_gerudo.xml b/soh/assets/xml/N64_PAL_10/objects/object_door_gerudo.xml new file mode 100644 index 000000000..2f1726204 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_door_gerudo.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_door_killer.xml b/soh/assets/xml/N64_PAL_10/objects/object_door_killer.xml new file mode 100644 index 000000000..a37f590d6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_door_killer.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ds.xml b/soh/assets/xml/N64_PAL_10/objects/object_ds.xml new file mode 100644 index 000000000..0413a9e2e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ds.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ds2.xml b/soh/assets/xml/N64_PAL_10/objects/object_ds2.xml new file mode 100644 index 000000000..683bcc68d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ds2.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_du.xml b/soh/assets/xml/N64_PAL_10/objects/object_du.xml new file mode 100644 index 000000000..44bbd1aa0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_du.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_dy_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_dy_obj.xml new file mode 100644 index 000000000..5e792edb5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_dy_obj.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ec.xml b/soh/assets/xml/N64_PAL_10/objects/object_ec.xml new file mode 100644 index 000000000..7ec83e284 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ec.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_crystal_light.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_crystal_light.xml new file mode 100644 index 000000000..9215b6a39 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_crystal_light.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_doughnut.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_doughnut.xml new file mode 100644 index 000000000..7f12c56f5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_doughnut.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_erupc.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_erupc.xml new file mode 100644 index 000000000..800d9535f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_erupc.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_fire_ball.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_fire_ball.xml new file mode 100644 index 000000000..2fc65b16f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_fire_ball.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_flash.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_flash.xml new file mode 100644 index 000000000..5f962f162 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_flash.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_lgt_shower.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_lgt_shower.xml new file mode 100644 index 000000000..67ef5ce7e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_lgt_shower.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_star_field.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_star_field.xml new file mode 100644 index 000000000..00b47c460 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_star_field.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_efc_tw.xml b/soh/assets/xml/N64_PAL_10/objects/object_efc_tw.xml new file mode 100644 index 000000000..de5376569 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_efc_tw.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ei.xml b/soh/assets/xml/N64_PAL_10/objects/object_ei.xml new file mode 100644 index 000000000..e4132491f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ei.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fa.xml b/soh/assets/xml/N64_PAL_10/objects/object_fa.xml new file mode 100644 index 000000000..2f1bf9a5e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fa.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fd.xml b/soh/assets/xml/N64_PAL_10/objects/object_fd.xml new file mode 100644 index 000000000..a1c51c724 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fd.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fd2.xml b/soh/assets/xml/N64_PAL_10/objects/object_fd2.xml new file mode 100644 index 000000000..44b5f5f9c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fd2.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fhg.xml b/soh/assets/xml/N64_PAL_10/objects/object_fhg.xml new file mode 100644 index 000000000..e159e2504 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fhg.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fire.xml b/soh/assets/xml/N64_PAL_10/objects/object_fire.xml new file mode 100644 index 000000000..49bf620cb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fire.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_firefly.xml b/soh/assets/xml/N64_PAL_10/objects/object_firefly.xml new file mode 100644 index 000000000..8c26a4341 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_firefly.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fish.xml b/soh/assets/xml/N64_PAL_10/objects/object_fish.xml new file mode 100644 index 000000000..f5ad4f6da --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fish.xml @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fr.xml b/soh/assets/xml/N64_PAL_10/objects/object_fr.xml new file mode 100644 index 000000000..25ee2ad42 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fr.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fu.xml b/soh/assets/xml/N64_PAL_10/objects/object_fu.xml new file mode 100644 index 000000000..82c449e3d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fu.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fw.xml b/soh/assets/xml/N64_PAL_10/objects/object_fw.xml new file mode 100644 index 000000000..ee9821d26 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fw.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_fz.xml b/soh/assets/xml/N64_PAL_10/objects/object_fz.xml new file mode 100644 index 000000000..dad6fec5c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_fz.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon.xml new file mode 100644 index 000000000..27c36a5f2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon2.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon2.xml new file mode 100644 index 000000000..93f3a05e5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon2.xml @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime1.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime1.xml new file mode 100644 index 000000000..b1016299b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime1.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime2.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime2.xml new file mode 100644 index 000000000..180e5995c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime2.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime3.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime3.xml new file mode 100644 index 000000000..be4c4dcb1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon_anime3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ganon_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_ganon_objects.xml new file mode 100644 index 000000000..5e32610ff --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ganon_objects.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ge1.xml b/soh/assets/xml/N64_PAL_10/objects/object_ge1.xml new file mode 100644 index 000000000..79e0768b8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ge1.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_geff.xml b/soh/assets/xml/N64_PAL_10/objects/object_geff.xml new file mode 100644 index 000000000..f0667743b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_geff.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_geldb.xml b/soh/assets/xml/N64_PAL_10/objects/object_geldb.xml new file mode 100644 index 000000000..49b12ef2e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_geldb.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_arrow.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_arrow.xml new file mode 100644 index 000000000..4b58787a9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_arrow.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_arrowcase.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_arrowcase.xml new file mode 100644 index 000000000..267b0a734 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_arrowcase.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bean.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bean.xml new file mode 100644 index 000000000..e74247816 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bean.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_1.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_1.xml new file mode 100644 index 000000000..bae86c11d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_1.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_2.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_2.xml new file mode 100644 index 000000000..1400c4a4d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bomb_2.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bombpouch.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bombpouch.xml new file mode 100644 index 000000000..07134748c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bombpouch.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_boomerang.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_boomerang.xml new file mode 100644 index 000000000..3c1a0fe7f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_boomerang.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_boots_2.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_boots_2.xml new file mode 100644 index 000000000..3bcb6a47a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_boots_2.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bosskey.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bosskey.xml new file mode 100644 index 000000000..e5e4bc86c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bosskey.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle.xml new file mode 100644 index 000000000..3b0884a03 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle_letter.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle_letter.xml new file mode 100644 index 000000000..443219caf --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bottle_letter.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bow.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bow.xml new file mode 100644 index 000000000..946e9c496 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bow.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_bracelet.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_bracelet.xml new file mode 100644 index 000000000..5a0b62a60 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_bracelet.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_brokensword.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_brokensword.xml new file mode 100644 index 000000000..408741ac5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_brokensword.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_butterfly.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_butterfly.xml new file mode 100644 index 000000000..7b60a7724 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_butterfly.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_clothes.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_clothes.xml new file mode 100644 index 000000000..3f897b6d1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_clothes.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_coin.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_coin.xml new file mode 100644 index 000000000..22e29f255 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_coin.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_compass.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_compass.xml new file mode 100644 index 000000000..076229b11 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_compass.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_dekupouch.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_dekupouch.xml new file mode 100644 index 000000000..8925e6fa5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_dekupouch.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_egg.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_egg.xml new file mode 100644 index 000000000..2b2e2847d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_egg.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_eye_lotion.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_eye_lotion.xml new file mode 100644 index 000000000..5128c5f6f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_eye_lotion.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_fire.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_fire.xml new file mode 100644 index 000000000..4bfd76a7c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_fire.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_fish.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_fish.xml new file mode 100644 index 000000000..edb39dc29 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_fish.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_frog.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_frog.xml new file mode 100644 index 000000000..a656c306b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_frog.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudo.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudo.xml new file mode 100644 index 000000000..d65daee8e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudo.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudomask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudomask.xml new file mode 100644 index 000000000..cfcb878d9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_gerudomask.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_ghost.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_ghost.xml new file mode 100644 index 000000000..795f0cfd1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_ghost.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_glasses.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_glasses.xml new file mode 100644 index 000000000..63d32ab5a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_glasses.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_gloves.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_gloves.xml new file mode 100644 index 000000000..0e1c4259d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_gloves.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_goddess.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_goddess.xml new file mode 100644 index 000000000..50cbdd891 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_goddess.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_golonmask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_golonmask.xml new file mode 100644 index 000000000..844d90e71 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_golonmask.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_grass.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_grass.xml new file mode 100644 index 000000000..ae7834201 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_grass.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_hammer.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_hammer.xml new file mode 100644 index 000000000..feb5c8659 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_hammer.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_heart.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_heart.xml new file mode 100644 index 000000000..48e78b1b5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_heart.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_hearts.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_hearts.xml new file mode 100644 index 000000000..d2e763e63 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_hearts.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_hookshot.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_hookshot.xml new file mode 100644 index 000000000..a6b3b0fda --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_hookshot.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_hoverboots.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_hoverboots.xml new file mode 100644 index 000000000..6d41df8fd --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_hoverboots.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_insect.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_insect.xml new file mode 100644 index 000000000..7af5b5b3b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_insect.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_jewel.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_jewel.xml new file mode 100644 index 000000000..e83c65116 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_jewel.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_key.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_key.xml new file mode 100644 index 000000000..a37d45a71 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_key.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_ki_tan_mask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_ki_tan_mask.xml new file mode 100644 index 000000000..46eff7d3e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_ki_tan_mask.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_letter.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_letter.xml new file mode 100644 index 000000000..bea868339 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_letter.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_liquid.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_liquid.xml new file mode 100644 index 000000000..18a5c3d7a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_liquid.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_longsword.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_longsword.xml new file mode 100644 index 000000000..7161e42e3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_longsword.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_m_arrow.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_m_arrow.xml new file mode 100644 index 000000000..0fd659ae9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_m_arrow.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_magicpot.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_magicpot.xml new file mode 100644 index 000000000..7623e6353 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_magicpot.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_map.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_map.xml new file mode 100644 index 000000000..471c1dab9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_map.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_medal.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_medal.xml new file mode 100644 index 000000000..28e5b1e68 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_medal.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_melody.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_melody.xml new file mode 100644 index 000000000..b01fca953 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_melody.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_milk.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_milk.xml new file mode 100644 index 000000000..a3e223b3e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_milk.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_mushroom.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_mushroom.xml new file mode 100644 index 000000000..5b19bca74 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_mushroom.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_niwatori.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_niwatori.xml new file mode 100644 index 000000000..c8389f62c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_niwatori.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_nuts.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_nuts.xml new file mode 100644 index 000000000..c59903c43 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_nuts.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina.xml new file mode 100644 index 000000000..82607677d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina_0.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina_0.xml new file mode 100644 index 000000000..2c5f70d98 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_ocarina_0.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_pachinko.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_pachinko.xml new file mode 100644 index 000000000..5f808baf9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_pachinko.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_powder.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_powder.xml new file mode 100644 index 000000000..fb7dc0155 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_powder.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_prescription.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_prescription.xml new file mode 100644 index 000000000..75ae7eb2b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_prescription.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_purse.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_purse.xml new file mode 100644 index 000000000..054731dec --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_purse.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_rabit_mask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_rabit_mask.xml new file mode 100644 index 000000000..9d4eb9487 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_rabit_mask.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_redead_mask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_redead_mask.xml new file mode 100644 index 000000000..7de08487f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_redead_mask.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_rupy.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_rupy.xml new file mode 100644 index 000000000..0a1af96d0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_rupy.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_saw.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_saw.xml new file mode 100644 index 000000000..dcc038b7c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_saw.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_scale.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_scale.xml new file mode 100644 index 000000000..1cf5de5b9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_scale.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_seed.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_seed.xml new file mode 100644 index 000000000..82c15c82d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_seed.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_1.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_1.xml new file mode 100644 index 000000000..2f11e3f6d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_1.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_2.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_2.xml new file mode 100644 index 000000000..176ae025f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_2.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_3.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_3.xml new file mode 100644 index 000000000..8d1e5dafd --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_shield_3.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_skj_mask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_skj_mask.xml new file mode 100644 index 000000000..e6c90f76f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_skj_mask.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_soldout.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_soldout.xml new file mode 100644 index 000000000..a15b1253e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_soldout.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_soul.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_soul.xml new file mode 100644 index 000000000..a68178eba --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_soul.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_stick.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_stick.xml new file mode 100644 index 000000000..fed89f465 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_stick.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_sutaru.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_sutaru.xml new file mode 100644 index 000000000..a2606afbe --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_sutaru.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_sword_1.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_sword_1.xml new file mode 100644 index 000000000..e1119abca --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_sword_1.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_ticketstone.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_ticketstone.xml new file mode 100644 index 000000000..73bf888d1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_ticketstone.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_truth_mask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_truth_mask.xml new file mode 100644 index 000000000..3b4edf3de --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_truth_mask.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gi_zoramask.xml b/soh/assets/xml/N64_PAL_10/objects/object_gi_zoramask.xml new file mode 100644 index 000000000..e3b1ab10e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gi_zoramask.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gj.xml b/soh/assets/xml/N64_PAL_10/objects/object_gj.xml new file mode 100644 index 000000000..ee6dab74f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gj.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gjyo_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_gjyo_objects.xml new file mode 100644 index 000000000..ea4f8444f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gjyo_objects.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gla.xml b/soh/assets/xml/N64_PAL_10/objects/object_gla.xml new file mode 100644 index 000000000..499a3720d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gla.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gm.xml b/soh/assets/xml/N64_PAL_10/objects/object_gm.xml new file mode 100644 index 000000000..91b10cc42 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gm.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gnd.xml b/soh/assets/xml/N64_PAL_10/objects/object_gnd.xml new file mode 100644 index 000000000..3ae3b57f3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gnd.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gnd_magic.xml b/soh/assets/xml/N64_PAL_10/objects/object_gnd_magic.xml new file mode 100644 index 000000000..a88d419d7 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gnd_magic.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gndd.xml b/soh/assets/xml/N64_PAL_10/objects/object_gndd.xml new file mode 100644 index 000000000..8bf5d770c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gndd.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_god_lgt.xml b/soh/assets/xml/N64_PAL_10/objects/object_god_lgt.xml new file mode 100644 index 000000000..60df9e469 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_god_lgt.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gol.xml b/soh/assets/xml/N64_PAL_10/objects/object_gol.xml new file mode 100644 index 000000000..7e04508cb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gol.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_goma.xml b/soh/assets/xml/N64_PAL_10/objects/object_goma.xml new file mode 100644 index 000000000..e7a6d0a54 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_goma.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_goroiwa.xml b/soh/assets/xml/N64_PAL_10/objects/object_goroiwa.xml new file mode 100644 index 000000000..5d406e957 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_goroiwa.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gr.xml b/soh/assets/xml/N64_PAL_10/objects/object_gr.xml new file mode 100644 index 000000000..5f7360ae5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gr.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gs.xml b/soh/assets/xml/N64_PAL_10/objects/object_gs.xml new file mode 100644 index 000000000..145be1665 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gs.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_gt.xml b/soh/assets/xml/N64_PAL_10/objects/object_gt.xml new file mode 100644 index 000000000..1d79d4e39 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_gt.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_haka.xml b/soh/assets/xml/N64_PAL_10/objects/object_haka.xml new file mode 100644 index 000000000..f6b263c37 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_haka.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_haka_door.xml b/soh/assets/xml/N64_PAL_10/objects/object_haka_door.xml new file mode 100644 index 000000000..1376d0356 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_haka_door.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_haka_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_haka_objects.xml new file mode 100644 index 000000000..3ca6d27c0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_haka_objects.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hakach_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_hakach_objects.xml new file mode 100644 index 000000000..0de02aaf1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hakach_objects.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hata.xml b/soh/assets/xml/N64_PAL_10/objects/object_hata.xml new file mode 100644 index 000000000..b0324c3be --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hata.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_heavy_object.xml b/soh/assets/xml/N64_PAL_10/objects/object_heavy_object.xml new file mode 100644 index 000000000..ecc795321 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_heavy_object.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hidan_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_hidan_objects.xml new file mode 100644 index 000000000..f41c0ee5e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hidan_objects.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hintnuts.xml b/soh/assets/xml/N64_PAL_10/objects/object_hintnuts.xml new file mode 100644 index 000000000..a7290f395 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hintnuts.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hni.xml b/soh/assets/xml/N64_PAL_10/objects/object_hni.xml new file mode 100644 index 000000000..6b317eb7a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hni.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_horse.xml b/soh/assets/xml/N64_PAL_10/objects/object_horse.xml new file mode 100644 index 000000000..74619e597 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_horse.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_horse_ganon.xml b/soh/assets/xml/N64_PAL_10/objects/object_horse_ganon.xml new file mode 100644 index 000000000..0a55462e2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_horse_ganon.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_horse_link_child.xml b/soh/assets/xml/N64_PAL_10/objects/object_horse_link_child.xml new file mode 100644 index 000000000..146c564f5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_horse_link_child.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_horse_normal.xml b/soh/assets/xml/N64_PAL_10/objects/object_horse_normal.xml new file mode 100644 index 000000000..2facab39c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_horse_normal.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_horse_zelda.xml b/soh/assets/xml/N64_PAL_10/objects/object_horse_zelda.xml new file mode 100644 index 000000000..af270c658 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_horse_zelda.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_hs.xml b/soh/assets/xml/N64_PAL_10/objects/object_hs.xml new file mode 100644 index 000000000..cf5d06e1a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_hs.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_human.xml b/soh/assets/xml/N64_PAL_10/objects/object_human.xml new file mode 100644 index 000000000..05795cb33 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_human.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ice_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_ice_objects.xml new file mode 100644 index 000000000..c7d059d70 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ice_objects.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ik.xml b/soh/assets/xml/N64_PAL_10/objects/object_ik.xml new file mode 100644 index 000000000..8a6028f7c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ik.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_im.xml b/soh/assets/xml/N64_PAL_10/objects/object_im.xml new file mode 100644 index 000000000..a628a113a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_im.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_in.xml b/soh/assets/xml/N64_PAL_10/objects/object_in.xml new file mode 100644 index 000000000..84c114047 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_in.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ingate.xml b/soh/assets/xml/N64_PAL_10/objects/object_ingate.xml new file mode 100644 index 000000000..e6be42beb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ingate.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_jj.xml b/soh/assets/xml/N64_PAL_10/objects/object_jj.xml new file mode 100644 index 000000000..62bae8cb9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_jj.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_js.xml b/soh/assets/xml/N64_PAL_10/objects/object_js.xml new file mode 100644 index 000000000..ff7bd3efa --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_js.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_jya_door.xml b/soh/assets/xml/N64_PAL_10/objects/object_jya_door.xml new file mode 100644 index 000000000..60a7b3788 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_jya_door.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_jya_iron.xml b/soh/assets/xml/N64_PAL_10/objects/object_jya_iron.xml new file mode 100644 index 000000000..c6f6773c6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_jya_iron.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_jya_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_jya_obj.xml new file mode 100644 index 000000000..a1f19b806 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_jya_obj.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ka.xml b/soh/assets/xml/N64_PAL_10/objects/object_ka.xml new file mode 100644 index 000000000..eb952732b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ka.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kanban.xml b/soh/assets/xml/N64_PAL_10/objects/object_kanban.xml new file mode 100644 index 000000000..9ffc7a2ce --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kanban.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kibako2.xml b/soh/assets/xml/N64_PAL_10/objects/object_kibako2.xml new file mode 100644 index 000000000..a701b294d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kibako2.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kingdodongo.xml b/soh/assets/xml/N64_PAL_10/objects/object_kingdodongo.xml new file mode 100644 index 000000000..9b104b3ea --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kingdodongo.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_km1.xml b/soh/assets/xml/N64_PAL_10/objects/object_km1.xml new file mode 100644 index 000000000..0a918a798 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_km1.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kusa.xml b/soh/assets/xml/N64_PAL_10/objects/object_kusa.xml new file mode 100644 index 000000000..67291a554 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kusa.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kw1.xml b/soh/assets/xml/N64_PAL_10/objects/object_kw1.xml new file mode 100644 index 000000000..eab561b1f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kw1.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_kz.xml b/soh/assets/xml/N64_PAL_10/objects/object_kz.xml new file mode 100644 index 000000000..4624fefdb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_kz.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_light_ring.xml b/soh/assets/xml/N64_PAL_10/objects/object_light_ring.xml new file mode 100644 index 000000000..babe7d2aa --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_light_ring.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_lightbox.xml b/soh/assets/xml/N64_PAL_10/objects/object_lightbox.xml new file mode 100644 index 000000000..552a79d7c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_lightbox.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_lightswitch.xml b/soh/assets/xml/N64_PAL_10/objects/object_lightswitch.xml new file mode 100644 index 000000000..cfd5dcfb4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_lightswitch.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml b/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml new file mode 100644 index 000000000..6351af505 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_link_boy.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_link_child.xml b/soh/assets/xml/N64_PAL_10/objects/object_link_child.xml new file mode 100644 index 000000000..0de400373 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_link_child.xml @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ma1.xml b/soh/assets/xml/N64_PAL_10/objects/object_ma1.xml new file mode 100644 index 000000000..63eeb3895 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ma1.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ma2.xml b/soh/assets/xml/N64_PAL_10/objects/object_ma2.xml new file mode 100644 index 000000000..ce5910fb8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ma2.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mag.xml b/soh/assets/xml/N64_PAL_10/objects/object_mag.xml new file mode 100644 index 000000000..257f72363 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mag.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mamenoki.xml b/soh/assets/xml/N64_PAL_10/objects/object_mamenoki.xml new file mode 100644 index 000000000..819d89022 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mamenoki.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mastergolon.xml b/soh/assets/xml/N64_PAL_10/objects/object_mastergolon.xml new file mode 100644 index 000000000..6dd9d1659 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mastergolon.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_masterkokiri.xml b/soh/assets/xml/N64_PAL_10/objects/object_masterkokiri.xml new file mode 100644 index 000000000..af5a9ec15 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_masterkokiri.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_masterkokirihead.xml b/soh/assets/xml/N64_PAL_10/objects/object_masterkokirihead.xml new file mode 100644 index 000000000..c64aa1c49 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_masterkokirihead.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_masterzoora.xml b/soh/assets/xml/N64_PAL_10/objects/object_masterzoora.xml new file mode 100644 index 000000000..2c703274e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_masterzoora.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mb.xml b/soh/assets/xml/N64_PAL_10/objects/object_mb.xml new file mode 100644 index 000000000..23c0930c0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mb.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_md.xml b/soh/assets/xml/N64_PAL_10/objects/object_md.xml new file mode 100644 index 000000000..161c73dca --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_md.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_medal.xml b/soh/assets/xml/N64_PAL_10/objects/object_medal.xml new file mode 100644 index 000000000..533872a55 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_medal.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_menkuri_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_menkuri_objects.xml new file mode 100644 index 000000000..4c2b51df5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_menkuri_objects.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mir_ray.xml b/soh/assets/xml/N64_PAL_10/objects/object_mir_ray.xml new file mode 100644 index 000000000..2acc9391a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mir_ray.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mizu_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_mizu_objects.xml new file mode 100644 index 000000000..5a18b95cf --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mizu_objects.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin.xml new file mode 100644 index 000000000..daf9b0541 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_dark.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_dark.xml new file mode 100644 index 000000000..2fa0bdbe4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_dark.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_flame.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_flame.xml new file mode 100644 index 000000000..6274feaee --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_flame.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_flash.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_flash.xml new file mode 100644 index 000000000..c1040ea11 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_flash.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_ice.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_ice.xml new file mode 100644 index 000000000..1aaeea193 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_ice.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_oka.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_oka.xml new file mode 100644 index 000000000..0f823b923 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_oka.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_soul.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_soul.xml new file mode 100644 index 000000000..6386f7f9e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_soul.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mjin_wind.xml b/soh/assets/xml/N64_PAL_10/objects/object_mjin_wind.xml new file mode 100644 index 000000000..8bba7eb91 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mjin_wind.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mk.xml b/soh/assets/xml/N64_PAL_10/objects/object_mk.xml new file mode 100644 index 000000000..0b4aaae8a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mk.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mm.xml b/soh/assets/xml/N64_PAL_10/objects/object_mm.xml new file mode 100644 index 000000000..b27837e57 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mm.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mo.xml b/soh/assets/xml/N64_PAL_10/objects/object_mo.xml new file mode 100644 index 000000000..2a6247c9f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mo.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1.xml new file mode 100644 index 000000000..bb1b31e2f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1a.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1a.xml new file mode 100644 index 000000000..c750ce20d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri1a.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2.xml new file mode 100644 index 000000000..785b85857 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2a.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2a.xml new file mode 100644 index 000000000..ad1bb4d5f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_hineri2a.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_objects.xml new file mode 100644 index 000000000..58ea8c085 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_objects.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mori_tex.xml b/soh/assets/xml/N64_PAL_10/objects/object_mori_tex.xml new file mode 100644 index 000000000..8ba4ff2d3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mori_tex.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ms.xml b/soh/assets/xml/N64_PAL_10/objects/object_ms.xml new file mode 100644 index 000000000..a87d0e6b3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ms.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_mu.xml b/soh/assets/xml/N64_PAL_10/objects/object_mu.xml new file mode 100644 index 000000000..7251ff721 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_mu.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_nb.xml b/soh/assets/xml/N64_PAL_10/objects/object_nb.xml new file mode 100644 index 000000000..74de9e285 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_nb.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_niw.xml b/soh/assets/xml/N64_PAL_10/objects/object_niw.xml new file mode 100644 index 000000000..4eafec956 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_niw.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_nwc.xml b/soh/assets/xml/N64_PAL_10/objects/object_nwc.xml new file mode 100644 index 000000000..96ffa3238 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_nwc.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ny.xml b/soh/assets/xml/N64_PAL_10/objects/object_ny.xml new file mode 100644 index 000000000..e2e8187ff --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ny.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA1.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA1.xml new file mode 100644 index 000000000..1d665f101 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA1.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA10.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA10.xml new file mode 100644 index 000000000..65d080834 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA10.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA11.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA11.xml new file mode 100644 index 000000000..92ae474b6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA11.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA2.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA2.xml new file mode 100644 index 000000000..ffdcd7989 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA2.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA3.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA3.xml new file mode 100644 index 000000000..a492bd875 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA4.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA4.xml new file mode 100644 index 000000000..dcdbbfff9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA4.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA5.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA5.xml new file mode 100644 index 000000000..55072176d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA5.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA6.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA6.xml new file mode 100644 index 000000000..c17a51088 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA6.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA7.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA7.xml new file mode 100644 index 000000000..52c68f639 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA7.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA8.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA8.xml new file mode 100644 index 000000000..8ed2d3df5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA8.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oA9.xml b/soh/assets/xml/N64_PAL_10/objects/object_oA9.xml new file mode 100644 index 000000000..d5c16abfc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oA9.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oB1.xml b/soh/assets/xml/N64_PAL_10/objects/object_oB1.xml new file mode 100644 index 000000000..2f50c967b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oB1.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oB2.xml b/soh/assets/xml/N64_PAL_10/objects/object_oB2.xml new file mode 100644 index 000000000..230783cea --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oB2.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oB3.xml b/soh/assets/xml/N64_PAL_10/objects/object_oB3.xml new file mode 100644 index 000000000..1c42ddacc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oB3.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oB4.xml b/soh/assets/xml/N64_PAL_10/objects/object_oB4.xml new file mode 100644 index 000000000..2924c9e75 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oB4.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE1.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE1.xml new file mode 100644 index 000000000..4d5b1663f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE1.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE10.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE10.xml new file mode 100644 index 000000000..04ce91437 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE10.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE11.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE11.xml new file mode 100644 index 000000000..04f6f186d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE11.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE12.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE12.xml new file mode 100644 index 000000000..a5fa39fd2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE12.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE1s.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE1s.xml new file mode 100644 index 000000000..d311e6010 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE1s.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE2.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE2.xml new file mode 100644 index 000000000..af62ad6d1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE2.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE3.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE3.xml new file mode 100644 index 000000000..95227da38 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE3.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE4.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE4.xml new file mode 100644 index 000000000..ae48d2ade --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE4.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE4s.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE4s.xml new file mode 100644 index 000000000..6037de52f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE4s.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE5.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE5.xml new file mode 100644 index 000000000..f5edf745a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE5.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE6.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE6.xml new file mode 100644 index 000000000..95bb602b6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE6.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE7.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE7.xml new file mode 100644 index 000000000..b3e588d4c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE7.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE8.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE8.xml new file mode 100644 index 000000000..be5de2494 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE8.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE9.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE9.xml new file mode 100644 index 000000000..8ea7ee18c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE9.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oE_anime.xml b/soh/assets/xml/N64_PAL_10/objects/object_oE_anime.xml new file mode 100644 index 000000000..f6b4659e2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oE_anime.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oF1d_map.xml b/soh/assets/xml/N64_PAL_10/objects/object_oF1d_map.xml new file mode 100644 index 000000000..f14fecd82 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oF1d_map.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_oF1s.xml b/soh/assets/xml/N64_PAL_10/objects/object_oF1s.xml new file mode 100644 index 000000000..fe41dde63 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_oF1s.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_o_anime.xml b/soh/assets/xml/N64_PAL_10/objects/object_o_anime.xml new file mode 100644 index 000000000..4ef4ac44c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_o_anime.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_okuta.xml b/soh/assets/xml/N64_PAL_10/objects/object_okuta.xml new file mode 100644 index 000000000..b4fccea6f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_okuta.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_opening_demo1.xml b/soh/assets/xml/N64_PAL_10/objects/object_opening_demo1.xml new file mode 100644 index 000000000..fd0323027 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_opening_demo1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_os.xml b/soh/assets/xml/N64_PAL_10/objects/object_os.xml new file mode 100644 index 000000000..5880a9293 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_os.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_os_anime.xml b/soh/assets/xml/N64_PAL_10/objects/object_os_anime.xml new file mode 100644 index 000000000..f23636343 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_os_anime.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ossan.xml b/soh/assets/xml/N64_PAL_10/objects/object_ossan.xml new file mode 100644 index 000000000..5788e3a20 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ossan.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ouke_haka.xml b/soh/assets/xml/N64_PAL_10/objects/object_ouke_haka.xml new file mode 100644 index 000000000..11da9b26e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ouke_haka.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_owl.xml b/soh/assets/xml/N64_PAL_10/objects/object_owl.xml new file mode 100644 index 000000000..64fdf64c5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_owl.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_peehat.xml b/soh/assets/xml/N64_PAL_10/objects/object_peehat.xml new file mode 100644 index 000000000..42ee66cde --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_peehat.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_po_composer.xml b/soh/assets/xml/N64_PAL_10/objects/object_po_composer.xml new file mode 100644 index 000000000..ff995efce --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_po_composer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_po_field.xml b/soh/assets/xml/N64_PAL_10/objects/object_po_field.xml new file mode 100644 index 000000000..78bc0d65a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_po_field.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_po_sisters.xml b/soh/assets/xml/N64_PAL_10/objects/object_po_sisters.xml new file mode 100644 index 000000000..b429be258 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_po_sisters.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_poh.xml b/soh/assets/xml/N64_PAL_10/objects/object_poh.xml new file mode 100644 index 000000000..be6d6eff4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_poh.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ps.xml b/soh/assets/xml/N64_PAL_10/objects/object_ps.xml new file mode 100644 index 000000000..9f9c894a6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ps.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_pu_box.xml b/soh/assets/xml/N64_PAL_10/objects/object_pu_box.xml new file mode 100644 index 000000000..e1d686e97 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_pu_box.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_rd.xml b/soh/assets/xml/N64_PAL_10/objects/object_rd.xml new file mode 100644 index 000000000..22c7d3373 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_rd.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_reeba.xml b/soh/assets/xml/N64_PAL_10/objects/object_reeba.xml new file mode 100644 index 000000000..32c697bd9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_reeba.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_relay_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_relay_objects.xml new file mode 100644 index 000000000..47b92fcd2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_relay_objects.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_rl.xml b/soh/assets/xml/N64_PAL_10/objects/object_rl.xml new file mode 100644 index 000000000..2a5ad30f6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_rl.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_rr.xml b/soh/assets/xml/N64_PAL_10/objects/object_rr.xml new file mode 100644 index 000000000..98726b14b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_rr.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_rs.xml b/soh/assets/xml/N64_PAL_10/objects/object_rs.xml new file mode 100644 index 000000000..152b5489e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_rs.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ru1.xml b/soh/assets/xml/N64_PAL_10/objects/object_ru1.xml new file mode 100644 index 000000000..3d413619f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ru1.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ru2.xml b/soh/assets/xml/N64_PAL_10/objects/object_ru2.xml new file mode 100644 index 000000000..fedf37d48 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ru2.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_sa.xml b/soh/assets/xml/N64_PAL_10/objects/object_sa.xml new file mode 100644 index 000000000..ec45ac961 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_sa.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_sb.xml b/soh/assets/xml/N64_PAL_10/objects/object_sb.xml new file mode 100644 index 000000000..64d3bb005 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_sb.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_sd.xml b/soh/assets/xml/N64_PAL_10/objects/object_sd.xml new file mode 100644 index 000000000..fb58428c3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_sd.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_shop_dungen.xml b/soh/assets/xml/N64_PAL_10/objects/object_shop_dungen.xml new file mode 100644 index 000000000..594c43d39 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_shop_dungen.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_shopnuts.xml b/soh/assets/xml/N64_PAL_10/objects/object_shopnuts.xml new file mode 100644 index 000000000..a4e12e38a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_shopnuts.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_siofuki.xml b/soh/assets/xml/N64_PAL_10/objects/object_siofuki.xml new file mode 100644 index 000000000..a23240a72 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_siofuki.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_sk2.xml b/soh/assets/xml/N64_PAL_10/objects/object_sk2.xml new file mode 100644 index 000000000..f2e7ef6d8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_sk2.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_skb.xml b/soh/assets/xml/N64_PAL_10/objects/object_skb.xml new file mode 100644 index 000000000..5b5efb484 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_skb.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_skj.xml b/soh/assets/xml/N64_PAL_10/objects/object_skj.xml new file mode 100644 index 000000000..74548e518 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_skj.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot00_break.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot00_break.xml new file mode 100644 index 000000000..d3be88315 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot00_break.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot00_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot00_objects.xml new file mode 100644 index 000000000..10fb13aea --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot00_objects.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoya.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoya.xml new file mode 100644 index 000000000..d44b944e0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoya.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoyab.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoyab.xml new file mode 100644 index 000000000..720f50cd3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot01_matoyab.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects.xml new file mode 100644 index 000000000..413e032a9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects2.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects2.xml new file mode 100644 index 000000000..36741a949 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot01_objects2.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot02_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot02_objects.xml new file mode 100644 index 000000000..65f45ff51 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot02_objects.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot03_object.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot03_object.xml new file mode 100644 index 000000000..f182e7d99 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot03_object.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot04_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot04_objects.xml new file mode 100644 index 000000000..66293d752 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot04_objects.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot05_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot05_objects.xml new file mode 100644 index 000000000..6e7079149 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot05_objects.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot06_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot06_objects.xml new file mode 100644 index 000000000..e3da63b0f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot06_objects.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot07_object.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot07_object.xml new file mode 100644 index 000000000..5bc2bfb6b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot07_object.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot08_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot08_obj.xml new file mode 100644 index 000000000..4d71f3473 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot08_obj.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot09_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot09_obj.xml new file mode 100644 index 000000000..eb6528393 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot09_obj.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot11_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot11_obj.xml new file mode 100644 index 000000000..257298f7c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot11_obj.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot12_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot12_obj.xml new file mode 100644 index 000000000..d619c781e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot12_obj.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot15_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot15_obj.xml new file mode 100644 index 000000000..bd59b8cd1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot15_obj.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot16_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot16_obj.xml new file mode 100644 index 000000000..d39de812a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot16_obj.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot17_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot17_obj.xml new file mode 100644 index 000000000..d4239d8d2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot17_obj.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_spot18_obj.xml b/soh/assets/xml/N64_PAL_10/objects/object_spot18_obj.xml new file mode 100644 index 000000000..cc12b7894 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_spot18_obj.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ssh.xml b/soh/assets/xml/N64_PAL_10/objects/object_ssh.xml new file mode 100644 index 000000000..6283f8e9f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ssh.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_sst.xml b/soh/assets/xml/N64_PAL_10/objects/object_sst.xml new file mode 100644 index 000000000..191c67cc8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_sst.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_st.xml b/soh/assets/xml/N64_PAL_10/objects/object_st.xml new file mode 100644 index 000000000..983b9e2ea --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_st.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_stream.xml b/soh/assets/xml/N64_PAL_10/objects/object_stream.xml new file mode 100644 index 000000000..59b0838e4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_stream.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_syokudai.xml b/soh/assets/xml/N64_PAL_10/objects/object_syokudai.xml new file mode 100644 index 000000000..c1670edec --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_syokudai.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ta.xml b/soh/assets/xml/N64_PAL_10/objects/object_ta.xml new file mode 100644 index 000000000..5e446bf5c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ta.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_timeblock.xml b/soh/assets/xml/N64_PAL_10/objects/object_timeblock.xml new file mode 100644 index 000000000..1d6b9e698 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_timeblock.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tite.xml b/soh/assets/xml/N64_PAL_10/objects/object_tite.xml new file mode 100644 index 000000000..1be65c495 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tite.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tk.xml b/soh/assets/xml/N64_PAL_10/objects/object_tk.xml new file mode 100644 index 000000000..6b6cce724 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tk.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_toki_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_toki_objects.xml new file mode 100644 index 000000000..cd07e60d2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_toki_objects.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_torch2.xml b/soh/assets/xml/N64_PAL_10/objects/object_torch2.xml new file mode 100644 index 000000000..3388e7d34 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_torch2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_toryo.xml b/soh/assets/xml/N64_PAL_10/objects/object_toryo.xml new file mode 100644 index 000000000..73f3dcb1e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_toryo.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tp.xml b/soh/assets/xml/N64_PAL_10/objects/object_tp.xml new file mode 100644 index 000000000..8ea908825 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tp.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tr.xml b/soh/assets/xml/N64_PAL_10/objects/object_tr.xml new file mode 100644 index 000000000..17ab9ae39 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tr.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_trap.xml b/soh/assets/xml/N64_PAL_10/objects/object_trap.xml new file mode 100644 index 000000000..56195cf41 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_trap.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_triforce_spot.xml b/soh/assets/xml/N64_PAL_10/objects/object_triforce_spot.xml new file mode 100644 index 000000000..87d449458 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_triforce_spot.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ts.xml b/soh/assets/xml/N64_PAL_10/objects/object_ts.xml new file mode 100644 index 000000000..567277bc3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ts.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tsubo.xml b/soh/assets/xml/N64_PAL_10/objects/object_tsubo.xml new file mode 100644 index 000000000..ee2c5e184 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tsubo.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_tw.xml b/soh/assets/xml/N64_PAL_10/objects/object_tw.xml new file mode 100644 index 000000000..be51f0b6c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_tw.xml @@ -0,0 +1,332 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_umajump.xml b/soh/assets/xml/N64_PAL_10/objects/object_umajump.xml new file mode 100644 index 000000000..2ee4ade46 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_umajump.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_vali.xml b/soh/assets/xml/N64_PAL_10/objects/object_vali.xml new file mode 100644 index 000000000..2bab5efaa --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_vali.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_vase.xml b/soh/assets/xml/N64_PAL_10/objects/object_vase.xml new file mode 100644 index 000000000..091d4c51e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_vase.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_vm.xml b/soh/assets/xml/N64_PAL_10/objects/object_vm.xml new file mode 100644 index 000000000..c5b949b36 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_vm.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_wallmaster.xml b/soh/assets/xml/N64_PAL_10/objects/object_wallmaster.xml new file mode 100644 index 000000000..fbbc4f4af --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_wallmaster.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_warp1.xml b/soh/assets/xml/N64_PAL_10/objects/object_warp1.xml new file mode 100644 index 000000000..1497d7a10 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_warp1.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_warp2.xml b/soh/assets/xml/N64_PAL_10/objects/object_warp2.xml new file mode 100644 index 000000000..b6d1b3624 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_warp2.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_wf.xml b/soh/assets/xml/N64_PAL_10/objects/object_wf.xml new file mode 100644 index 000000000..ebfb708d2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_wf.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_wood02.xml b/soh/assets/xml/N64_PAL_10/objects/object_wood02.xml new file mode 100644 index 000000000..47ec342ca --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_wood02.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_xc.xml b/soh/assets/xml/N64_PAL_10/objects/object_xc.xml new file mode 100644 index 000000000..ab1a34a4b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_xc.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_yabusame_point.xml b/soh/assets/xml/N64_PAL_10/objects/object_yabusame_point.xml new file mode 100644 index 000000000..bed9e8a60 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_yabusame_point.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_ydan_objects.xml b/soh/assets/xml/N64_PAL_10/objects/object_ydan_objects.xml new file mode 100644 index 000000000..e2adf307f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_ydan_objects.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_yukabyun.xml b/soh/assets/xml/N64_PAL_10/objects/object_yukabyun.xml new file mode 100644 index 000000000..d594ebbb8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_yukabyun.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zf.xml b/soh/assets/xml/N64_PAL_10/objects/object_zf.xml new file mode 100644 index 000000000..7f20eb786 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zf.xml @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zg.xml b/soh/assets/xml/N64_PAL_10/objects/object_zg.xml new file mode 100644 index 000000000..79005516c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zg.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zl1.xml b/soh/assets/xml/N64_PAL_10/objects/object_zl1.xml new file mode 100644 index 000000000..001e5be14 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zl1.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zl2.xml b/soh/assets/xml/N64_PAL_10/objects/object_zl2.xml new file mode 100644 index 000000000..959a919ec --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zl2.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime1.xml b/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime1.xml new file mode 100644 index 000000000..cada50486 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime1.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime2.xml b/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime2.xml new file mode 100644 index 000000000..47016e2e0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zl2_anime2.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zl4.xml b/soh/assets/xml/N64_PAL_10/objects/object_zl4.xml new file mode 100644 index 000000000..8e7a2837e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zl4.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/objects/object_zo.xml b/soh/assets/xml/N64_PAL_10/objects/object_zo.xml new file mode 100644 index 000000000..77465760e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/objects/object_zo.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Fire.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Fire.xml new file mode 100644 index 000000000..ffd0d324c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Fire.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Ice.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Ice.xml new file mode 100644 index 000000000..69882e7e2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Ice.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Light.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Light.xml new file mode 100644 index 000000000..1bd6a5b28 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Arrow_Light.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Ganon_Otyuka.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Ganon_Otyuka.xml new file mode 100644 index 000000000..aa420ca6b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Ganon_Otyuka.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Jya_Cobra.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Jya_Cobra.xml new file mode 100644 index 000000000..f9e99ec92 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Bg_Jya_Cobra.xml @@ -0,0 +1,10 @@ + + + + + + + + + + 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 new file mode 100644 index 000000000..8f0c7612c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon.xml new file mode 100644 index 000000000..769eade34 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon2.xml new file mode 100644 index 000000000..64e810e97 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Ganon2.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Sst.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Sst.xml new file mode 100644 index 000000000..e77834c87 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Boss_Sst.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Demo_Shd.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Demo_Shd.xml new file mode 100644 index 000000000..3d92225f1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Demo_Shd.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Bili.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Bili.xml new file mode 100644 index 000000000..791bb1e63 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Bili.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Clear_Tag.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Clear_Tag.xml new file mode 100644 index 000000000..8d2e6c7c1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Clear_Tag.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Mant.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Mant.xml new file mode 100644 index 000000000..67e9d66e1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Mant.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Organ.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Organ.xml new file mode 100644 index 000000000..507d54930 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ganon_Organ.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Holl.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Holl.xml new file mode 100644 index 000000000..7df3f65fe --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Holl.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Jsjutan.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Jsjutan.xml new file mode 100644 index 000000000..298c0adb1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Jsjutan.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Kanban.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Kanban.xml new file mode 100644 index 000000000..8cbb6f3ba --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Kanban.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sda.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sda.xml new file mode 100644 index 000000000..286bc5f06 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sda.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ssh.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ssh.xml new file mode 100644 index 000000000..5390eb7b9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Ssh.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_St.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_St.xml new file mode 100644 index 000000000..a0f560c81 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_St.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sth.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sth.xml new file mode 100644 index 000000000..1566da96b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_En_Sth.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_End_Title.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_End_Title.xml new file mode 100644 index 000000000..37b2d19d7 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_End_Title.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_File_Choose.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_File_Choose.xml new file mode 100644 index 000000000..8db916ced --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_File_Choose.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Dark.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Dark.xml new file mode 100644 index 000000000..cf1eba6f3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Dark.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Fire.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Fire.xml new file mode 100644 index 000000000..ec0b52b86 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Fire.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Wind.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Wind.xml new file mode 100644 index 000000000..b8579f1b5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Magic_Wind.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Spot.xml new file mode 100644 index 000000000..875ef572c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Spot.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Storm.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Storm.xml new file mode 100644 index 000000000..86f3adba3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Storm.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe.xml new file mode 100644 index 000000000..c2d58cde9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe2.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe2.xml new file mode 100644 index 000000000..2b69eb590 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe3.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe3.xml new file mode 100644 index 000000000..64bf93773 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe3.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe4.xml b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe4.xml new file mode 100644 index 000000000..ed7d2ab02 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/overlays/ovl_Oceff_Wipe4.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/Bmori1.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/Bmori1.xml new file mode 100644 index 000000000..ad4311426 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/Bmori1.xml @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/FIRE_bs.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/FIRE_bs.xml new file mode 100644 index 000000000..89331ecc2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/FIRE_bs.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan.xml new file mode 100644 index 000000000..e557c80a5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan.xml @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdanCH.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdanCH.xml new file mode 100644 index 000000000..97401aff6 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdanCH.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan_bs.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan_bs.xml new file mode 100644 index 000000000..d36ac6b77 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HAKAdan_bs.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/HIDAN.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HIDAN.xml new file mode 100644 index 000000000..fa4d784f1 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/HIDAN.xml @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin.xml new file mode 100644 index 000000000..00c5aa82d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin.xml @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin_bs.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin_bs.xml new file mode 100644 index 000000000..99ae2b3ef --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/MIZUsin_bs.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan.xml new file mode 100644 index 000000000..41c009d7d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan_boss.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan_boss.xml new file mode 100644 index 000000000..b88d6eb03 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/bdan_boss.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan.xml new file mode 100644 index 000000000..1446a9c98 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan.xml @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan_boss.xml new file mode 100644 index 000000000..05633e53e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ddan_boss.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon.xml new file mode 100644 index 000000000..f857dbe94 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_boss.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_boss.xml new file mode 100644 index 000000000..36c5e8107 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_boss.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_demo.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_demo.xml new file mode 100644 index 000000000..56c98efed --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_demo.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_final.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_final.xml new file mode 100644 index 000000000..3ec568cfb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_final.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_sonogo.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_sonogo.xml new file mode 100644 index 000000000..84ef36950 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_sonogo.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_tou.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_tou.xml new file mode 100644 index 000000000..1ae37b963 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganon_tou.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontika.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontika.xml new file mode 100644 index 000000000..a5ff210ce --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontika.xml @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontikasonogo.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontikasonogo.xml new file mode 100644 index 000000000..060d4941b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ganontikasonogo.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/gerudoway.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/gerudoway.xml new file mode 100644 index 000000000..827277614 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/gerudoway.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ice_doukutu.xml new file mode 100644 index 000000000..8aa1788bc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ice_doukutu.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinboss.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinboss.xml new file mode 100644 index 000000000..86c0d317b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinboss.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinzou.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinzou.xml new file mode 100644 index 000000000..bc14a46ac --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/jyasinzou.xml @@ -0,0 +1,358 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/men.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/men.xml new file mode 100644 index 000000000..d9e5960e8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/men.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/moribossroom.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/moribossroom.xml new file mode 100644 index 000000000..b9959eefa --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/moribossroom.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan.xml new file mode 100644 index 000000000..aed7d2660 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan_boss.xml b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan_boss.xml new file mode 100644 index 000000000..7ea240547 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/dungeons/ydan_boss.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/bowling.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/bowling.xml new file mode 100644 index 000000000..9a41763a2 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/bowling.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/daiyousei_izumi.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/daiyousei_izumi.xml new file mode 100644 index 000000000..4f9a03fc0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/daiyousei_izumi.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa.xml new file mode 100644 index 000000000..06d89f2fe --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa_n.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa_n.xml new file mode 100644 index 000000000..6f4c181e0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/hairal_niwa_n.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/hakasitarelay.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/hakasitarelay.xml new file mode 100644 index 000000000..91be63d14 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/hakasitarelay.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/hut.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/hut.xml new file mode 100644 index 000000000..a4ef5715f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/hut.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/hylia_labo.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/hylia_labo.xml new file mode 100644 index 000000000..56822e67a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/hylia_labo.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/impa.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/impa.xml new file mode 100644 index 000000000..db757e3d3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/impa.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kakariko.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kakariko.xml new file mode 100644 index 000000000..e4e9b102c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kakariko.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kenjyanoma.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kenjyanoma.xml new file mode 100644 index 000000000..4e8a58f3b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kenjyanoma.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home.xml new file mode 100644 index 000000000..8c0305493 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home3.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home3.xml new file mode 100644 index 000000000..9f36eb41c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home3.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home4.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home4.xml new file mode 100644 index 000000000..eb861aedb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home4.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home5.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home5.xml new file mode 100644 index 000000000..974987fed --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/kokiri_home5.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/labo.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/labo.xml new file mode 100644 index 000000000..c0a9d2eb8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/labo.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/link_home.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/link_home.xml new file mode 100644 index 000000000..2fb88ae34 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/link_home.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/mahouya.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/mahouya.xml new file mode 100644 index 000000000..8ae462f9d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/mahouya.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/malon_stable.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/malon_stable.xml new file mode 100644 index 000000000..aff97eeb8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/malon_stable.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/miharigoya.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/miharigoya.xml new file mode 100644 index 000000000..63f8676ac --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/miharigoya.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/nakaniwa.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/nakaniwa.xml new file mode 100644 index 000000000..2fb2d5e6a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/nakaniwa.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/syatekijyou.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/syatekijyou.xml new file mode 100644 index 000000000..05243b52c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/syatekijyou.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/takaraya.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/takaraya.xml new file mode 100644 index 000000000..5b438980b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/takaraya.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/tent.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/tent.xml new file mode 100644 index 000000000..de72cc5f4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/tent.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/tokinoma.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/tokinoma.xml new file mode 100644 index 000000000..c3f818012 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/tokinoma.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_tate.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_tate.xml new file mode 100644 index 000000000..3b6dd2dec --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_tate.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_yoko.xml b/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_yoko.xml new file mode 100644 index 000000000..90a8d95d0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/indoors/yousei_izumi_yoko.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/enrui.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/enrui.xml new file mode 100644 index 000000000..d8c06e545 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/enrui.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/entra_n.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/entra_n.xml new file mode 100644 index 000000000..5b408ac3a --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/entra_n.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana.xml new file mode 100644 index 000000000..e7dc93dd0 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana2.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana2.xml new file mode 100644 index 000000000..2d8ba4906 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana2.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana_ouke.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana_ouke.xml new file mode 100644 index 000000000..17f53613e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/hakaana_ouke.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/hiral_demo.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/hiral_demo.xml new file mode 100644 index 000000000..1331fdd4c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/hiral_demo.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/kakariko3.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/kakariko3.xml new file mode 100644 index 000000000..07b62c44d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/kakariko3.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/kakusiana.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/kakusiana.xml new file mode 100644 index 000000000..c3f993ff4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/kakusiana.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/kinsuta.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/kinsuta.xml new file mode 100644 index 000000000..aac0f6c4e --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/kinsuta.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley.xml new file mode 100644 index 000000000..c30467303 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley_n.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley_n.xml new file mode 100644 index 000000000..65db60411 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/market_alley_n.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/market_day.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/market_day.xml new file mode 100644 index 000000000..00887e69c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/market_day.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/market_night.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/market_night.xml new file mode 100644 index 000000000..c58e38744 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/market_night.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/market_ruins.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/market_ruins.xml new file mode 100644 index 000000000..f0ec75e75 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/market_ruins.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/shrine.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine.xml new file mode 100644 index 000000000..b9ddf2cf7 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_n.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_n.xml new file mode 100644 index 000000000..4878338aa --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_n.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_r.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_r.xml new file mode 100644 index 000000000..122036791 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/shrine_r.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/misc/turibori.xml b/soh/assets/xml/N64_PAL_10/scenes/misc/turibori.xml new file mode 100644 index 000000000..0633224d9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/misc/turibori.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/entra.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/entra.xml new file mode 100644 index 000000000..92ee57f59 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/entra.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/souko.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/souko.xml new file mode 100644 index 000000000..8dd9d9e48 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/souko.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot00.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot00.xml new file mode 100644 index 000000000..42d051a44 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot00.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot01.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot01.xml new file mode 100644 index 000000000..c0af66958 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot01.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot02.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot02.xml new file mode 100644 index 000000000..c7924c29d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot02.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot03.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot03.xml new file mode 100644 index 000000000..9434185f4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot03.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot04.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot04.xml new file mode 100644 index 000000000..16503c1b4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot04.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot05.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot05.xml new file mode 100644 index 000000000..c605e9cc9 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot05.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot06.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot06.xml new file mode 100644 index 000000000..0d2b16d90 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot06.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot07.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot07.xml new file mode 100644 index 000000000..b833ee3cd --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot07.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot08.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot08.xml new file mode 100644 index 000000000..86582f0dc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot08.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot09.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot09.xml new file mode 100644 index 000000000..0983f1e26 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot09.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot10.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot10.xml new file mode 100644 index 000000000..66365e3d8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot10.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot11.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot11.xml new file mode 100644 index 000000000..f8682c436 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot11.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot12.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot12.xml new file mode 100644 index 000000000..6171c7e09 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot12.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot13.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot13.xml new file mode 100644 index 000000000..c68913065 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot13.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot15.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot15.xml new file mode 100644 index 000000000..e75f7b684 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot15.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot16.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot16.xml new file mode 100644 index 000000000..4bf535712 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot16.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot17.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot17.xml new file mode 100644 index 000000000..6d598888d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot17.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot18.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot18.xml new file mode 100644 index 000000000..57cb59b98 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot18.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/overworld/spot20.xml b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot20.xml new file mode 100644 index 000000000..5580e832c --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/overworld/spot20.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/alley_shop.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/alley_shop.xml new file mode 100644 index 000000000..95548de1b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/alley_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/drag.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/drag.xml new file mode 100644 index 000000000..acb6515fb --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/drag.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/face_shop.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/face_shop.xml new file mode 100644 index 000000000..16a974608 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/face_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/golon.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/golon.xml new file mode 100644 index 000000000..c58672798 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/golon.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/kokiri_shop.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/kokiri_shop.xml new file mode 100644 index 000000000..50cd633e5 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/kokiri_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/night_shop.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/night_shop.xml new file mode 100644 index 000000000..5954d9c83 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/night_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/shop1.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/shop1.xml new file mode 100644 index 000000000..525a06d63 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/shop1.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/scenes/shops/zoora.xml b/soh/assets/xml/N64_PAL_10/scenes/shops/zoora.xml new file mode 100644 index 000000000..0e4ac18f8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/scenes/shops/zoora.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/text/elf_message_field.xml b/soh/assets/xml/N64_PAL_10/text/elf_message_field.xml new file mode 100644 index 000000000..789a554ce --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/text/elf_message_field.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/soh/assets/xml/N64_PAL_10/text/elf_message_ydan.xml b/soh/assets/xml/N64_PAL_10/text/elf_message_ydan.xml new file mode 100644 index 000000000..f784afcf4 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/text/elf_message_ydan.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/soh/assets/xml/N64_PAL_10/text/message_data_static.xml b/soh/assets/xml/N64_PAL_10/text/message_data_static.xml new file mode 100644 index 000000000..f48375c41 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/text/message_data_static.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/backgrounds.xml b/soh/assets/xml/N64_PAL_10/textures/backgrounds.xml new file mode 100644 index 000000000..c60ff57a8 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/backgrounds.xml @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/boss_title_cards.xml b/soh/assets/xml/N64_PAL_10/textures/boss_title_cards.xml new file mode 100644 index 000000000..3667d2bdf --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/boss_title_cards.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/soh/assets/xml/N64_PAL_10/textures/do_action_static.xml b/soh/assets/xml/N64_PAL_10/textures/do_action_static.xml new file mode 100644 index 000000000..2cbd613b3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/do_action_static.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_24_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_24_static.xml new file mode 100644 index 000000000..cdb8cc737 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_24_static.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_dungeon_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_dungeon_static.xml new file mode 100644 index 000000000..873c490fc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_dungeon_static.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_field_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_field_static.xml new file mode 100644 index 000000000..ed991406b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_field_static.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_fra_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_fra_static.xml new file mode 100644 index 000000000..2c8ccad5b --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_fra_static.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_gameover_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_gameover_static.xml new file mode 100644 index 000000000..fc2a50642 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_gameover_static.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_ger_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_ger_static.xml new file mode 100644 index 000000000..ea71dda35 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_ger_static.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_nes_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_nes_static.xml new file mode 100644 index 000000000..6cd92acfc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_nes_static.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/icon_item_static.xml b/soh/assets/xml/N64_PAL_10/textures/icon_item_static.xml new file mode 100644 index 000000000..2bd26b79d --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/icon_item_static.xml @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/item_name_static.xml b/soh/assets/xml/N64_PAL_10/textures/item_name_static.xml new file mode 100644 index 000000000..00c497490 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/item_name_static.xml @@ -0,0 +1,373 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/map_48x85_static.xml b/soh/assets/xml/N64_PAL_10/textures/map_48x85_static.xml new file mode 100644 index 000000000..b2ea46340 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/map_48x85_static.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/soh/assets/xml/N64_PAL_10/textures/map_grand_static.xml b/soh/assets/xml/N64_PAL_10/textures/map_grand_static.xml new file mode 100644 index 000000000..201955bfc --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/map_grand_static.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/map_i_static.xml b/soh/assets/xml/N64_PAL_10/textures/map_i_static.xml new file mode 100644 index 000000000..1721f6d84 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/map_i_static.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/map_name_static.xml b/soh/assets/xml/N64_PAL_10/textures/map_name_static.xml new file mode 100644 index 000000000..7f9d31589 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/map_name_static.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/message_static.xml b/soh/assets/xml/N64_PAL_10/textures/message_static.xml new file mode 100644 index 000000000..afdde60de --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/message_static.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/message_texture_static.xml b/soh/assets/xml/N64_PAL_10/textures/message_texture_static.xml new file mode 100644 index 000000000..bbf7e1259 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/message_texture_static.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/nes_font_static.xml b/soh/assets/xml/N64_PAL_10/textures/nes_font_static.xml new file mode 100644 index 000000000..f1b80ee04 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/nes_font_static.xml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/nintendo_rogo_static.xml b/soh/assets/xml/N64_PAL_10/textures/nintendo_rogo_static.xml new file mode 100644 index 000000000..f09de3b0f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/nintendo_rogo_static.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/parameter_static.xml b/soh/assets/xml/N64_PAL_10/textures/parameter_static.xml new file mode 100644 index 000000000..c51dacf1f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/parameter_static.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/place_title_cards.xml b/soh/assets/xml/N64_PAL_10/textures/place_title_cards.xml new file mode 100644 index 000000000..188661b41 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/place_title_cards.xml @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/skyboxes.xml b/soh/assets/xml/N64_PAL_10/textures/skyboxes.xml new file mode 100644 index 000000000..104ffb2a3 --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/skyboxes.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_10/textures/title_static.xml b/soh/assets/xml/N64_PAL_10/textures/title_static.xml new file mode 100644 index 000000000..eb8d3288f --- /dev/null +++ b/soh/assets/xml/N64_PAL_10/textures/title_static.xml @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml b/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml index 36d70566d..5a619b8f6 100644 --- a/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml +++ b/soh/assets/xml/N64_PAL_11/code/fbdemo_circle.xml @@ -1,5 +1,5 @@ - + @@ -8,6 +8,6 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml b/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml index 19cac4e02..00d067a25 100644 --- a/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml +++ b/soh/assets/xml/N64_PAL_11/code/fbdemo_wipe1.xml @@ -1,10 +1,10 @@ - - + + - - + + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml b/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml index 02075c999..6351af505 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml @@ -209,7 +209,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/objects/object_md.xml b/soh/assets/xml/N64_PAL_11/objects/object_md.xml index 0c80fb780..161c73dca 100644 --- a/soh/assets/xml/N64_PAL_11/objects/object_md.xml +++ b/soh/assets/xml/N64_PAL_11/objects/object_md.xml @@ -53,7 +53,7 @@ - + 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 f2ee5b7b8..cd9069e13 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/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml index 25d29f441..30b885713 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon.xml @@ -1,7 +1,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml index f09784a55..892b63d6a 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Boss_Ganon2.xml @@ -71,6 +71,6 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml b/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml index 9a53952f0..64ddc8e1c 100644 --- a/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml +++ b/soh/assets/xml/N64_PAL_11/overlays/ovl_Oceff_Spot.xml @@ -1,10 +1,10 @@ - - - + + + - - + + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml index 5eeac3773..05633e53e 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ddan_boss.xml @@ -16,7 +16,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml index 4369cf579..8aa1788bc 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/dungeons/ice_doukutu.xml @@ -6,7 +6,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml b/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml index 88fc3bad3..c3f818012 100644 --- a/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml +++ b/soh/assets/xml/N64_PAL_11/scenes/indoors/tokinoma.xml @@ -10,7 +10,7 @@ - + diff --git a/soh/assets/xml/N64_PAL_11/textures/do_action_static.xml b/soh/assets/xml/N64_PAL_11/textures/do_action_static.xml index 9ae8d9815..2cbd613b3 100644 --- a/soh/assets/xml/N64_PAL_11/textures/do_action_static.xml +++ b/soh/assets/xml/N64_PAL_11/textures/do_action_static.xml @@ -10,7 +10,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/soh/include/functions.h b/soh/include/functions.h index 6b7732ae9..3a1aa8ae2 100644 --- a/soh/include/functions.h +++ b/soh/include/functions.h @@ -1090,8 +1090,8 @@ s32 Health_ChangeBy(PlayState* play, s16 healthChange); void Rupees_ChangeBy(s16 rupeeChange); void Inventory_ChangeAmmo(s16 item, s16 ammoChange); void Magic_Fill(PlayState* play); -void func_800876C8(PlayState* play); -s32 func_80087708(PlayState* play, s16 arg1, s16 arg2); +void Magic_Reset(PlayState* play); +s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type); void func_80088AA0(s16 seconds); void func_80088AF0(PlayState* play); void func_80088B34(s16 arg0); @@ -2449,13 +2449,18 @@ void Heaps_Free(void); CollisionHeader* BgCheck_GetCollisionHeader(CollisionContext* colCtx, s32 bgId); -void Interface_CreateQuadVertexGroup(Vtx* vtxList, s32 xStart, s32 yStart, s32 width, s32 height, u8 flippedH); - // Exposing these methods to leverage them from the file select screen to render messages void Message_OpenText(PlayState* play, u16 textId); void Message_Decode(PlayState* play); void Message_DrawText(PlayState* play, Gfx** gfxP); +// #region SOH [General] + +void Interface_CreateQuadVertexGroup(Vtx* vtxList, s32 xStart, s32 yStart, s32 width, s32 height, u8 flippedH); +void Interface_RandoRestoreSwordless(void); + +// #endregion + #ifdef __cplusplus #undef this }; diff --git a/soh/include/macros.h b/soh/include/macros.h index 5157315ac..93f7e17c6 100644 --- a/soh/include/macros.h +++ b/soh/include/macros.h @@ -292,11 +292,6 @@ extern GraphicsContext* __gfxCtx; #define SEG_ADDR(seg, addr) (addr | (seg << 24) | 1) // #endregion -// #region SOH [Enhancements] -#define CHECK_EQUIPMENT_AGE(i, j) (CVarGetInteger("gTimelessEquipment", 0) || (gEquipAgeReqs[i][j] == 9) || (gEquipAgeReqs[i][j] == ((void)0, gSaveContext.linkAge))) -#define CHECK_SLOT_AGE(slotIndex) (CVarGetInteger("gTimelessEquipment", 0) || (gSlotAgeReqs[slotIndex] == 9) || gSlotAgeReqs[slotIndex] == ((void)0, gSaveContext.linkAge)) -#define CHECK_ITEM_AGE(itemIndex) (CVarGetInteger("gTimelessEquipment", 0) || (gItemAgeReqs[itemIndex] == 9) || (gItemAgeReqs[itemIndex] == gSaveContext.linkAge)) - #define DPAD_ITEM(button) ((gSaveContext.buttonStatus[(button) + 5] != BTN_DISABLED) \ ? gSaveContext.equips.buttonItems[(button) + 4] \ : ITEM_NONE) diff --git a/soh/include/variables.h b/soh/include/variables.h index ee73d003b..2bad8335c 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[]; @@ -82,7 +82,7 @@ extern "C" extern s16 gSpoilingItems[3]; extern s16 gSpoilingItemReverts[3]; extern FlexSkeletonHeader* gPlayerSkelHeaders[2]; - extern u8 gPlayerModelTypes[][5]; + extern u8 gPlayerModelTypes[PLAYER_MODELGROUP_MAX][PLAYER_MODELGROUPENTRY_MAX]; extern Gfx* gPlayerLeftHandBgsDLs[]; extern Gfx* gPlayerLeftHandOpenDLs[]; extern Gfx* gPlayerLeftHandClosedDLs[]; diff --git a/soh/include/z64.h b/soh/include/z64.h index 2172dcb74..23ffcfb17 100644 --- a/soh/include/z64.h +++ b/soh/include/z64.h @@ -2245,6 +2245,8 @@ typedef enum { LED_SOURCE_TUNIC_ORIGINAL, LED_SOURCE_TUNIC_COSMETICS, LED_SOURCE_HEALTH, + LED_SOURCE_NAVI_ORIGINAL, + LED_SOURCE_NAVI_COSMETICS, LED_SOURCE_CUSTOM } LEDColorSource; diff --git a/soh/include/z64item.h b/soh/include/z64item.h index 2f0038872..1fc919a45 100644 --- a/soh/include/z64item.h +++ b/soh/include/z64item.h @@ -2,12 +2,74 @@ #define Z64ITEM_H typedef enum { - /* 0x00 */ EQUIP_SWORD, - /* 0x01 */ EQUIP_SHIELD, - /* 0x02 */ EQUIP_TUNIC, - /* 0x03 */ EQUIP_BOOTS + /* 0 */ EQUIP_TYPE_SWORD, + /* 1 */ EQUIP_TYPE_SHIELD, + /* 2 */ EQUIP_TYPE_TUNIC, + /* 3 */ EQUIP_TYPE_BOOTS, + /* 4 */ EQUIP_TYPE_MAX } EquipmentType; +// `EquipInv*` enums are for Inventory.equipment (for example used in the `CHECK_OWNED_EQUIP` macro) + +typedef enum { + /* 0 */ EQUIP_INV_SWORD_KOKIRI, + /* 1 */ EQUIP_INV_SWORD_MASTER, + /* 2 */ EQUIP_INV_SWORD_BIGGORON, + /* 3 */ EQUIP_INV_SWORD_BROKENGIANTKNIFE +} EquipInvSword; + +typedef enum { + /* 0 */ EQUIP_INV_SHIELD_DEKU, + /* 1 */ EQUIP_INV_SHIELD_HYLIAN, + /* 2 */ EQUIP_INV_SHIELD_MIRROR +} EquipInvShield; + +typedef enum { + /* 0 */ EQUIP_INV_TUNIC_KOKIRI, + /* 1 */ EQUIP_INV_TUNIC_GORON, + /* 2 */ EQUIP_INV_TUNIC_ZORA +} EquipInvTunic; + +typedef enum { + /* 0 */ EQUIP_INV_BOOTS_KOKIRI, + /* 1 */ EQUIP_INV_BOOTS_IRON, + /* 2 */ EQUIP_INV_BOOTS_HOVER +} EquipInvBoots; + +// `EquipValue*` enums are for ItemEquips.equipment (for example used in the `CUR_EQUIP_VALUE` macro) + +typedef enum { + /* 0 */ EQUIP_VALUE_SWORD_NONE, + /* 1 */ EQUIP_VALUE_SWORD_KOKIRI, + /* 2 */ EQUIP_VALUE_SWORD_MASTER, + /* 3 */ EQUIP_VALUE_SWORD_BIGGORON, + /* 4 */ EQUIP_VALUE_SWORD_MAX +} EquipValueSword; + +typedef enum { + /* 0 */ EQUIP_VALUE_SHIELD_NONE, + /* 1 */ EQUIP_VALUE_SHIELD_DEKU, + /* 2 */ EQUIP_VALUE_SHIELD_HYLIAN, + /* 3 */ EQUIP_VALUE_SHIELD_MIRROR, + /* 4 */ EQUIP_VALUE_SHIELD_MAX +} EquipValueShield; + +typedef enum { + /* 0 */ EQUIP_VALUE_TUNIC_NONE, + /* 1 */ EQUIP_VALUE_TUNIC_KOKIRI, + /* 2 */ EQUIP_VALUE_TUNIC_GORON, + /* 3 */ EQUIP_VALUE_TUNIC_ZORA, + /* 4 */ EQUIP_VALUE_TUNIC_MAX +} EquipValueTunic; + +typedef enum { + /* 0 */ EQUIP_VALUE_BOOTS_NONE, + /* 1 */ EQUIP_VALUE_BOOTS_KOKIRI, + /* 2 */ EQUIP_VALUE_BOOTS_IRON, + /* 3 */ EQUIP_VALUE_BOOTS_HOVER, + /* 4 */ EQUIP_VALUE_BOOTS_MAX +} EquipValueBoots; + typedef enum { /* 0x00 */ UPG_QUIVER, /* 0x01 */ UPG_BOMB_BAG, diff --git a/soh/include/z64save.h b/soh/include/z64save.h index 8d3acf22f..c7bee045f 100644 --- a/soh/include/z64save.h +++ b/soh/include/z64save.h @@ -92,7 +92,6 @@ typedef struct { /* */ u32 count[COUNT_MAX]; /* */ u32 entrancesDiscovered[SAVEFILE_ENTRANCES_DISCOVERED_IDX_COUNT]; /* */ u32 scenesDiscovered[SAVEFILE_SCENES_DISCOVERED_IDX_COUNT]; - /* */ u8 locationsSkipped[RC_MAX]; /* */ bool rtaTiming; /* */ uint64_t fileCreatedAt; } SohStats; @@ -280,18 +279,17 @@ 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]; - /* */ u8 mqDungeonCount; /* */ u8 pendingIceTrapCount; /* */ SohStats sohStats; - /* */ u8 temporaryWeapon; /* */ FaroresWindData backupFW; + /* */ RandomizerCheckTrackerData checkTrackerData[RC_MAX]; // #endregion // #region SOH [Randomizer] // Upstream TODO: Move these to their own struct or name to more obviously specific to Randomizer @@ -302,11 +300,11 @@ typedef struct { /* */ char childAltarText[250]; /* */ char adultAltarText[750]; /* */ RandomizerCheck rewardCheck[9]; - /* */ char ganonHintText[150]; + /* */ char ganonHintText[300]; /* */ char gregHintText[250]; /* */ char ganonText[250]; /* */ char dampeText[150]; - /* */ char sheikText[150]; + /* */ char sheikText[200]; /* */ char sariaText[150]; /* */ char warpMinuetText[100]; /* */ char warpBoleroText[100]; @@ -314,6 +312,7 @@ typedef struct { /* */ char warpRequiemText[100]; /* */ char warpNocturneText[100]; /* */ char warpPreludeText[100]; + /* */ RandomizerCheck masterSwordHintCheck; /* */ RandomizerCheck lightArrowHintCheck; /* */ RandomizerCheck sariaCheck; /* */ RandomizerCheck gregCheck; @@ -322,6 +321,7 @@ typedef struct { /* */ u32 finalSeed; /* */ u8 seedIcons[5]; /* */ u16 randomizerInf[10]; + /* */ u8 mqDungeonCount; /* */ u16 adultTradeItems; /* */ u8 triforcePiecesCollected; // #endregion diff --git a/soh/macosx/soh-macos.sh b/soh/macosx/soh-macos.sh.in similarity index 94% rename from soh/macosx/soh-macos.sh rename to soh/macosx/soh-macos.sh.in index ee2356ab3..0983f63b1 100755 --- a/soh/macosx/soh-macos.sh +++ b/soh/macosx/soh-macos.sh.in @@ -24,6 +24,12 @@ remap_hashes () d6342c59007e57c1194661ec6880b2f078403f4e) # n64 ROMHASH=0227d7c0074f2d0ac935631990da8ec5914597b4 ;; + d0bdc2eb320668b4ba6893b9aefe4040a73123ff) # v64 + ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5 + ;; + 4946ab250f6ac9b32d76b21f309ebb8ebc8103d2) # n64 + ROMHASH=328a1f1beba30ce5e178f031662019eb32c5f3b5 + ;; 663c34f1b2c05a09e5beffe4d0dcd440f7d49dc7) # v64 ROMHASH=cfbb98d392e4a9d39da8285d10cbef3974c2f012 ;; @@ -103,6 +109,8 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then ROM_TYPE=0;; 0227d7c0074f2d0ac935631990da8ec5914597b4) ROM_TYPE=0;; + 328a1f1beba30ce5e178f031662019eb32c5f3b5) + ROM_TYPE=0;; cfbb98d392e4a9d39da8285d10cbef3974c2f012) ROM_TYPE=0;; f46239439f59a2a594ef83cf68ef65043b1bffe2) @@ -172,9 +180,7 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then export ASSETDIR cp -r "$RESPATH/assets" "$ASSETDIR" mkdir -p "$ASSETDIR"/tmp - mkdir -p "$ASSETDIR"/Extract cp "$ROMPATH" "$ASSETDIR"/tmp/rom.z64 - cp -r "$ASSETDIR"/assets/game "$ASSETDIR"/Extract/assets/ cd "$ASSETDIR" || return # If an invalid rom was detected, let the user know @@ -189,6 +195,9 @@ if [ ! -e "$SHIP_HOME"/oot.otr ] || [ ! -e "$SHIP_HOME"/oot-mq.otr ]; then 0227d7c0074f2d0ac935631990da8ec5914597b4) ROM=GC_NMQ_PAL_F OTRNAME="oot.otr";; + 328a1f1beba30ce5e178f031662019eb32c5f3b5) + ROM=N64_PAL_10 + OTRNAME="oot.otr";; cfbb98d392e4a9d39da8285d10cbef3974c2f012) ROM=N64_PAL_11 OTRNAME="oot.otr";; @@ -210,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 @@ -234,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/Enhancements/audio/AudioCollection.cpp b/soh/soh/Enhancements/audio/AudioCollection.cpp index 960627b34..a5499bd4f 100644 --- a/soh/soh/Enhancements/audio/AudioCollection.cpp +++ b/soh/soh/Enhancements/audio/AudioCollection.cpp @@ -8,301 +8,323 @@ #include #include -#define SEQUENCE_MAP_ENTRY(sequenceId, label, sfxKey, category) \ - { sequenceId, { sequenceId, label, sfxKey, category } } +#define SEQUENCE_MAP_ENTRY(sequenceId, label, sfxKey, category, canBeReplaced, canBeUsedAsReplacement) \ + { sequenceId, { sequenceId, label, sfxKey, category, canBeReplaced, canBeUsedAsReplacement } } AudioCollection::AudioCollection() { - // (originalSequenceId, label, sfxKey, category), + // (originalSequenceId, label, sfxKey, category, canBeReplaced, canBeUsedAsReplacement), sequenceMap = { - SEQUENCE_MAP_ENTRY(NA_BGM_FIELD_LOGIC, "Hyrule Field", "NA_BGM_FIELD_LOGIC", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_DUNGEON, "Dodongo's Cavern", "NA_BGM_DUNGEON", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_KAKARIKO_ADULT, "Kakariko Village (Adult)", "NA_BGM_KAKARIKO_ADULT", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_ENEMY, "Battle", "NA_BGM_ENEMY", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_BOSS, "Boss Battle", "NA_BGM_BOSS", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_INSIDE_DEKU_TREE, "Inside the Deku Tree", "NA_BGM_INSIDE_DEKU_TREE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_MARKET, "Market", "NA_BGM_MARKET", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_TITLE, "Title Theme", "NA_BGM_TITLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_LINK_HOUSE, "House", "NA_BGM_LINK_HOUSE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_GAME_OVER, "Game Over", "NA_BGM_GAME_OVER", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_BOSS_CLEAR, "Boss Clear", "NA_BGM_BOSS_CLEAR", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_ITEM_GET, "Obtain Item", "NA_BGM_ITEM_GET", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_OPENING_GANON, "Enter Ganondorf", "NA_BGM_OPENING_GANON", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_HEART_GET, "Obtain Heart Container", "NA_BGM_HEART_GET", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_LIGHT, "Prelude of Light", "NA_BGM_OCA_LIGHT", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_JABU_JABU, "Inside Jabu-Jabu's Belly", "NA_BGM_JABU_JABU", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_KAKARIKO_KID, "Kakariko Village (Child)", "NA_BGM_KAKARIKO_KID", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_GREAT_FAIRY, "Great Fairy's Fountain", "NA_BGM_GREAT_FAIRY", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_ZELDA_THEME, "Zelda's Theme", "NA_BGM_ZELDA_THEME", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_FIRE_TEMPLE, "Fire Temple", "NA_BGM_FIRE_TEMPLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_OPEN_TRE_BOX, "Open Treasure Chest", "NA_BGM_OPEN_TRE_BOX", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_FOREST_TEMPLE, "Forest Temple", "NA_BGM_FOREST_TEMPLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_COURTYARD, "Hyrule Castle Courtyard", "NA_BGM_COURTYARD", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_GANON_TOWER, "Ganondorf's Theme", "NA_BGM_GANON_TOWER", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_LONLON, "Lon Lon Ranch", "NA_BGM_LONLON", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_GORON_CITY, "Goron City", "NA_BGM_GORON_CITY", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_FIELD_MORNING, "Hyrule Field Morning Theme", "NA_BGM_FIELD_MORNING", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_SPIRITUAL_STONE, "Spiritual Stone Get", "NA_BGM_SPIRITUAL_STONE", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_BOLERO, "Bolero of Fire", "NA_BGM_OCA_BOLERO", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_MINUET, "Minuet of Forest", "NA_BGM_OCA_MINUET", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SERENADE, "Serenade of Water", "NA_BGM_OCA_SERENADE", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_REQUIEM, "Requiem of Spirit", "NA_BGM_OCA_REQUIEM", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_NOCTURNE, "Nocturne of Shadow", "NA_BGM_OCA_NOCTURNE", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_MINI_BOSS, "Mini-Boss Battle", "NA_BGM_MINI_BOSS", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_SMALL_ITEM_GET, "Obtain Small Item", "NA_BGM_SMALL_ITEM_GET", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_TEMPLE_OF_TIME, "Temple of Time", "NA_BGM_TEMPLE_OF_TIME", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_EVENT_CLEAR, "Escape from Lon Lon Ranch", "NA_BGM_EVENT_CLEAR", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_KOKIRI, "Kokiri Forest", "NA_BGM_KOKIRI", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_FAIRY_GET, "Obtain Fairy Ocarina", "NA_BGM_OCA_FAIRY_GET", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_SARIA_THEME, "Lost Woods", "NA_BGM_SARIA_THEME", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_SPIRIT_TEMPLE, "Spirit Temple", "NA_BGM_SPIRIT_TEMPLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_HORSE, "Horse Race", "NA_BGM_HORSE", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_HORSE_GOAL, "Horse Race Goal", "NA_BGM_HORSE_GOAL", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_INGO, "Ingo's Theme", "NA_BGM_INGO", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_MEDALLION_GET, "Obtain Medallion", "NA_BGM_MEDALLION_GET", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SARIA, "Ocarina Saria's Song", "NA_BGM_OCA_SARIA", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_EPONA, "Ocarina Epona's Song", "NA_BGM_OCA_EPONA", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_ZELDA, "Ocarina Zelda's Lullaby", "NA_BGM_OCA_ZELDA", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SUNS, "Ocarina Sun's Song", "NA_BGM_OCA_SUNS", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_TIME, "Ocarina Song of Time", "NA_BGM_OCA_TIME", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_OCA_STORM, "Ocarina Song of Storms", "NA_BGM_OCA_STORM", SEQ_OCARINA), - SEQUENCE_MAP_ENTRY(NA_BGM_NAVI_OPENING, "Fairy Flying", "NA_BGM_NAVI_OPENING", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_DEKU_TREE_CS, "Deku Tree", "NA_BGM_DEKU_TREE_CS", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_WINDMILL, "Windmill Hut", "NA_BGM_WINDMILL", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_HYRULE_CS, "Legend of Hyrule", "NA_BGM_HYRULE_CS", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_MINI_GAME, "Shooting Gallery", "NA_BGM_MINI_GAME", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_SHEIK, "Sheik's Theme", "NA_BGM_SHEIK", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_ZORA_DOMAIN, "Zora's Domain", "NA_BGM_ZORA_DOMAIN", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_APPEAR, "Enter Zelda", "NA_BGM_APPEAR", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_ADULT_LINK, "Goodbye to Zelda", "NA_BGM_ADULT_LINK", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_MASTER_SWORD, "Master Sword", "NA_BGM_MASTER_SWORD", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_INTRO_GANON, "Ganon Intro", "NA_BGM_INTRO_GANON", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_SHOP, "Shop", "NA_BGM_SHOP", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_CHAMBER_OF_SAGES, "Chamber of the Sages", "NA_BGM_CHAMBER_OF_SAGES", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_FILE_SELECT, "File Select", "NA_BGM_FILE_SELECT", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_ICE_CAVERN, "Ice Cavern", "NA_BGM_ICE_CAVERN", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_DOOR_OF_TIME, "Open Door of Temple of Time", "NA_BGM_DOOR_OF_TIME", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_OWL, "Kaepora Gaebora's Theme", "NA_BGM_OWL", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_SHADOW_TEMPLE, "Shadow Temple", "NA_BGM_SHADOW_TEMPLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_WATER_TEMPLE, "Water Temple", "NA_BGM_WATER_TEMPLE", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_BRIDGE_TO_GANONS, "Ganon's Castle Bridge", "NA_BGM_BRIDGE_TO_GANONS", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_OCARINA_OF_TIME, "Ocarina of Time", "NA_BGM_OCARINA_OF_TIME", SEQ_FANFARE), - SEQUENCE_MAP_ENTRY(NA_BGM_GERUDO_VALLEY, "Gerudo Valley", "NA_BGM_GERUDO_VALLEY", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_POTION_SHOP, "Potion Shop", "NA_BGM_POTION_SHOP", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_KOTAKE_KOUME, "Kotake & Koume's Theme", "NA_BGM_KOTAKE_KOUME", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_ESCAPE, "Escape from Ganon's Castle", "NA_BGM_ESCAPE", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(NA_BGM_UNDERGROUND, "Ganon's Castle Under Ground", "NA_BGM_UNDERGROUND", SEQ_BGM_WORLD), - SEQUENCE_MAP_ENTRY(NA_BGM_GANONDORF_BOSS, "Ganondorf Battle", "NA_BGM_GANONDORF_BOSS", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_GANON_BOSS, "Ganon Battle", "NA_BGM_GANON_BOSS", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_END_DEMO, "Seal of Six Sages", "NA_BGM_END_DEMO", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_1, "End Credits I", "NA_BGM_STAFF_1", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_2, "End Credits II", "NA_BGM_STAFF_2", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_3, "End Credits III", "NA_BGM_STAFF_3", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_4, "End Credits IV", "NA_BGM_STAFF_4", SEQ_NOSHUFFLE), - SEQUENCE_MAP_ENTRY(NA_BGM_FIRE_BOSS, "King Dodongo & Volvagia Boss Battle", "NA_BGM_FIRE_BOSS", SEQ_BGM_BATTLE), - SEQUENCE_MAP_ENTRY(NA_BGM_TIMED_MINI_GAME, "Mini-Game", "NA_BGM_TIMED_MINI_GAME", SEQ_BGM_EVENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 1, "Ocarina", "OCARINA_INSTRUMENT_DEFAULT", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 2, "Malon", "OCARINA_INSTRUMENT_MALON", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 3, "Whistle", "OCARINA_INSTRUMENT_WHISTLE", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 4, "Harp", "OCARINA_INSTRUMENT_HARP", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 5, "Organ", "OCARINA_INSTRUMENT_GRIND_ORGAN", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 6, "Flute", "OCARINA_INSTRUMENT_FLUTE", SEQ_INSTRUMENT), - SEQUENCE_MAP_ENTRY(NA_SE_EV_SMALL_DOG_BARK, "Bark", "NA_SE_EV_SMALL_DOG_BARK", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BOUND, "Bomb Bounce", "NA_SE_EN_AWA_BOUND", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_SHADEST_TAIKO_LOW, "Bongo Bongo Low", "NA_SE_EN_SHADEST_TAIKO_LOW", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_FAINT, "Business Scrub", "NA_SE_EN_NUTS_FAINT", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_CARROT_RECOVER, "Carrot Refill", "NA_SE_SY_CARROT_RECOVER", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_N, "Cluck", "NA_SE_EV_CHICKEN_CRY_N", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_BRIDGE_OPEN_STOP, "Drawbridge Set", "NA_SE_EV_BRIDGE_OPEN_STOP", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_KAICHO_CRY, "Guay", "NA_SE_EN_KAICHO_CRY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_HITPOINT_ALARM, "Low HP Beep", "NA_SE_SY_HITPOINT_ALARM", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_HP_RECOVER, "HP Recover", "NA_SE_SY_HP_RECOVER", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_HORSE_RUN, "Horse Trot", "NA_SE_EV_HORSE_RUN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_PL_WALK_HEAVYBOOTS, "Iron Boots", "NA_SE_PL_WALK_HEAVYBOOTS", SEQ_SFX), - //SEQUENCE_MAP_ENTRY(NA_SE_PL_HOBBERBOOTS_LV, "Hover Boots", "NA_SE_PL_HOBBERBOOTS_LV", SEQ_SFX), // Doesn't work due to SFX_FLAG - SEQUENCE_MAP_ENTRY(NA_SE_EV_COW_CRY, "Moo", "NA_SE_EV_COW_CRY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_POT_BROKEN, "Pot Shattering", "NA_SE_EV_POT_BROKEN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_FROG_CRY_0, "Ribbit", "NA_SE_EV_FROG_CRY_0", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_FIVE_COUNT_LUPY, "Rupee (Silver)", "NA_SE_EV_FIVE_COUNT_LUPY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_FOOT_SWITCH, "Switch", "NA_SE_EV_FOOT_SWITCH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_IT_WALL_HIT_SOFT, "Sword Bonk", "NA_SE_IT_WALL_HIT_SOFT", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_METRONOME, "Tambourine", "NA_SE_SY_METRONOME", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_AMOS_VOICE, "Armos", "NA_SE_EN_AMOS_VOICE", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_REDEAD_AIM, "Redead Scream", "NA_SE_EN_REDEAD_AIM", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_STALKID_ATTACK, "Stalchild Attack", "NA_SE_EN_STALKID_ATTACK", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_M, "Cockadoodiedoo", "NA_SE_EV_CHICKEN_CRY_M", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_KINSTA_MARK_APPEAR, "Gold Skulltula Token", "NA_SE_SY_KINSTA_MARK_APPEAR", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_REDEAD_CRY, "Redead Moan", "NA_SE_EN_REDEAD_CRY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_LIGHTNING, "Thunder", "NA_SE_EV_LIGHTNING", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_OC_ABYSS, "Cartoon Fall", "NA_SE_OC_ABYSS", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_FLAME_LAUGH, "Flare Dancer Laugh", "NA_SE_EN_FLAME_LAUGH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BREAK, "Shabom Pop", "NA_SE_EN_AWA_BREAK", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_SHADEST_TAIKO_HIGH, "Bongo Bongo High", "NA_SE_EN_SHADEST_TAIKO_HIGH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_BOTTLE_CAP_OPEN, "Bottle Cork", "NA_SE_EV_BOTTLE_CAP_OPEN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_IT_BOW_FLICK, "Bow Twang", "NA_SE_IT_BOW_FLICK", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_BUBLE_LAUGH, "Bubble Laugh", "NA_SE_EN_BUBLE_LAUGH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_DEKU_JR_MOUTH, "Deku Baba", "NA_SE_EN_DEKU_JR_MOUTH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_DOG_CRY_EVENING, "Dusk Howl", "NA_SE_EV_DOG_CRY_EVENING", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_FLAME_DAMAGE, "Flare Dancer Startled", "NA_SE_EN_FLAME_DAMAGE", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_GANON_AT_RETURN, "Ganondorf Teh!", "NA_SE_EN_GANON_AT_RETURN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_GOMA_JR_CRY, "Gohma Larva Croak", "NA_SE_EN_GOMA_JR_CRY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_GOLON_WAKE_UP, "Goron Wake", "NA_SE_EN_GOLON_WAKE_UP", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_START_SHOT, "Gunshot", "NA_SE_SY_START_SHOT", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_IT_HAMMER_HIT, "Hammer Bonk", "NA_SE_IT_HAMMER_HIT", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_IRONNACK_SWING_AXE, "Iron Knuckle", "NA_SE_EN_IRONNACK_SWING_AXE", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_FANTOM_ST_LAUGH, "Phantom Ganon Laugh", "NA_SE_EN_FANTOM_ST_LAUGH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_PLANT_BROKEN, "Plant Explode", "NA_SE_EV_PLANT_BROKEN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_GET_RUPY, "Rupee", "NA_SE_SY_GET_RUPY", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_UP, "Scrub Emerge", "NA_SE_EN_NUTS_UP", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BOUND, "Shabom Bounce", "NA_SE_EN_AWA_BOUND", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_SHELL_MOUTH, "Shellblade", "NA_SE_EN_SHELL_MOUTH", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_STALTU_DAMAGE, "Skulltula Damage", "NA_SE_EN_STALTU_DAMAGE", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_THROW, "Spit Nut", "NA_SE_EN_NUTS_THROW", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_LOCK_ON, "Target Enemy", "NA_SE_SY_LOCK_ON", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_LOCK_ON_HUMAN, "Target Neutral", "NA_SE_SY_LOCK_ON_HUMAN", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_CURSOR, "File Select Cursor", "NA_SE_SY_FSEL_CURSOR", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_DECIDE_L, "File Select Choose", "NA_SE_SY_FSEL_DECIDE_L", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_CLOSE, "File Select Back", "NA_SE_SY_FSEL_CLOSE", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_IT_BOMB_EXPLOSION, "Bomb Explosion", "NA_SE_IT_BOMB_EXPLOSION", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_A, "Chicken Cry", "NA_SE_EV_CHICKEN_CRY_A", SEQ_SFX), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_N, "Adult Link - Slash", "NA_SE_VO_LI_SWORD_N", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_L, "Adult Link - Big Slash", "NA_SE_VO_LI_SWORD_L", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LASH, "Adult Link - Hookshot Latch Yell", "NA_SE_VO_LI_LASH", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HANG, "Adult Link - Dangling Gasp", "NA_SE_VO_LI_HANG", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_CLIMB_END, "Adult Link - Climb Edge", "NA_SE_VO_LI_CLIMB_END", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DAMAGE_S, "Adult Link - Small Damage", "NA_SE_VO_LI_DAMAGE_S", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FREEZE, "Adult Link - Freeze", "NA_SE_VO_LI_FREEZE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_S, "Adult Link - Fall Gasp", "NA_SE_VO_LI_FALL_S", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_L, "Adult Link - Fall Scream", "NA_SE_VO_LI_FALL_L", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_REST, "Adult Link - Low Health Sigh", "NA_SE_VO_LI_BREATH_REST", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_DRINK, "Adult Link - Bottle Sigh", "NA_SE_VO_LI_BREATH_DRINK", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DOWN, "Adult Link - Death", "NA_SE_VO_LI_DOWN", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_TAKEN_AWAY, "Adult Link - Taken away by Wallmaster","NA_SE_VO_LI_TAKEN_AWAY", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HELD, "Adult Link - Grabbed by Wallmaster", "NA_SE_VO_LI_HELD", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SNEEZE, "Adult Link - Sneeze", "NA_SE_VO_LI_SNEEZE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWEAT, "Adult Link - Gasp (Hot Room)", "NA_SE_VO_LI_SWEAT", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DRINK, "Adult Link - Drinking", "NA_SE_VO_LI_DRINK", SEQ_VOICE), // Doesn't work due to SFX_FLAG - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_RELAX, "Adult Link - Yawn", "NA_SE_VO_LI_RELAX", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_PUTAWAY, "Adult Link - Yell (Sword Putaway)", "NA_SE_VO_LI_SWORD_PUTAWAY", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_GROAN, "Adult Link - Groan (Unused)", "NA_SE_VO_LI_GROAN", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP, "Adult Link - Jump/Swing Bottle", "NA_SE_VO_LI_AUTOd_JUMP", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_NALE, "Adult Link - Use Nayru's Love", "NA_SE_VO_LI_MAGIC_NALE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SURPRISE, "Adult Link - Suprised Gasp", "NA_SE_VO_LI_SURPRISE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_FROL, "Adult Link - Use Farore's Wind", "NA_SE_VO_LI_MAGIC_FROL", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_PUSH, "Adult Link - Push", "NA_SE_VO_LI_PUSH", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HOOKSHOT_HANG, "Adult Link - Hookshot hang", "NA_SE_VO_LI_HOOKSHOT_HANG", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LAND_DAMAGE_S, "Adult Link - Fall damage", "NA_SE_VO_LI_LAND_DAMAGE_S", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_NULL_0x1b, "Adult Link - Small grunt (unused?)", "NA_SE_VO_LI_NULL_0x1b", SEQ_VOICE), // Unused? But unique so keeping it - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_ATTACK, "Adult Link - Din's Fire", "NA_SE_VO_LI_MAGIC_ATTACK", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_BL_DOWN, "Adult Link - Scream (Nocturne?)", "NA_SE_VO_BL_DOWN", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DEMO_DAMAGE, "Adult Link - Pained Land (Nocturne?)","NA_SE_VO_LI_DEMO_DAMAGE", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY("Adult Link - Unused Sound 1?","NA_SE_VO_LI_ELECTRIC_SHOCK_LV", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_N_KID, "Child Link - Slash", "NA_SE_VO_LI_SWORD_N_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_ROLLING_CUT_KID, "Child Link - Big Slash", "NA_SE_VO_LI_ROLLING_CUT_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LASH_KID, "Child Link - Hootshot Latch", "NA_SE_VO_LI_LASH_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HANG_KID, "Child Link - Dangling Gasp", "NA_SE_VO_LI_HANG_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_CLIMB_END_KID, "Child Link - Climb Edge", "NA_SE_VO_LI_CLIMB_END_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DAMAGE_S_KID, "Child Link - Small Damage", "NA_SE_VO_LI_DAMAGE_S_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FREEZE_KID, "Child Link - Freeze", "NA_SE_VO_LI_FREEZE_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_S_KID, "Child Link - Fall Gasp", "NA_SE_VO_LI_FALL_S_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_L_KID, "Child Link - Fall Scream", "NA_SE_VO_LI_FALL_L_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_REST_KID, "Child Link - Low Health Sigh", "NA_SE_VO_LI_BREATH_REST_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_DRINK_KID, "Child Link - Bottle Sigh", "NA_SE_VO_LI_BREATH_DRINK_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DOWN_KID, "Child Link - Death", "NA_SE_VO_LI_DOWN_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_TAKEN_AWAY_KID, "Child Link - Taken away by Wallmaster","NA_SE_VO_LI_TAKEN_AWAY_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HELD_KID, "Child Link - Grabbed by Wallmaster", "NA_SE_VO_LI_HELD_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SNEEZE_KID, "Child Link - Sneeze", "NA_SE_VO_LI_SNEEZE_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWEAT_KID, "Child Link - Gasp (Hot Room)", "NA_SE_VO_LI_SWEAT_KID", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DRINK_KID, "Child Link - Drinking", "NA_SE_VO_LI_DRINK_KID", SEQ_VOICE), // Doesn't work due to SFX_FLAG - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_RELAX_KID, "Child Link - Yawn", "NA_SE_VO_LI_RELAX_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_PUTAWAY_KID,"Child Link - Yell (Sword Putaway)", "NA_SE_VO_LI_SWORD_PUTAWAY_KID", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_GROAN_KID, "Child Link - Groan (Unused)", "NA_SE_VO_LI_GROAN_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP_KID, "Child Link - Jump/Swing Bottle", "NA_SE_VO_LI_AUTO_JUMP_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_NALE_KID, "Child Link - Use Nayru's Love", "NA_SE_VO_LI_MAGIC_NALE_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SURPRISE_KID, "Child Link - Surprised Gasp", "NA_SE_VO_LI_SURPRISE_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_FROL_KID, "Child Link - Use Farore's Wind", "NA_SE_VO_LI_MAGIC_FROL_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_PUSH_KID, "Child Link - Push", "NA_SE_VO_LI_PUSH_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HOOKSHOT_HANG_KID,"Child Link - Hookshot Hang", "NA_SE_VO_LI_HOOKSHOT_HANG_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LAND_DAMAGE_S_KID,"Child Link - Fall Damage", "NA_SE_VO_LI_LAND_DAMAGE_S_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_NULL_0x1b_KID, "Child Link - Small Gasp (unused?)", "NA_SE_VO_LI_NULL_0x1b_KID", SEQ_VOICE), // Unused? But unique so keeping it - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_ATTACK_KID, "Child Link - Din's Fire", "NA_SE_VO_LI_MAGIC_ATTACK_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_BL_DOWN_KID, "Child Link - Scream (Nocturne?)", "NA_SE_VO_BL_DOWN_KID", SEQ_VOICE), // ... - SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DEMO_DAMAGE_KID, "Child Link - Scream 2 (Nocturne?)", "NA_SE_VO_LI_DEMO_DAMAGE_KID", SEQ_VOICE), // Unused, matches with adult nocturne stuff - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID, "Child Link - Unused Sound 1?", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_ENEMY, "Navi - Unused Enemy Target", "NA_SE_VO_NAVY_ENEMY", SEQ_VOICE), // Has no sound but is played when targetting enemies, unsure to keep or not - SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_HELLO, "Navi - Unused NPC Hello", "NA_SE_VO_NAVY_HELLO", SEQ_VOICE), // Has no sound but is played when targetting npcs, unsure to keep or not - SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_HEAR, "Navi - Unused Other Target", "NA_SE_VO_NAVY_HEAR", SEQ_VOICE), // Has no sound but is played when targetting npcs, unsure to keep or not - SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_CALL, "Navi - Look/Hey/Watchout (Target Enemy)","NA_SE_VO_NAVY_CALL", SEQ_VOICE), // Has no sound but is played when targetting signs and other things, unsure to keep or not - SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_3, "Navi - Hello", "NA_SE_VO_NA_HELLO_3", SEQ_VOICE), + + // SEQ_BGM_WORLD + SEQUENCE_MAP_ENTRY(NA_BGM_FIELD_LOGIC, "Hyrule Field", "NA_BGM_FIELD_LOGIC", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_DUNGEON, "Dodongo's Cavern", "NA_BGM_DUNGEON", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_KAKARIKO_ADULT, "Kakariko Village (Adult)", "NA_BGM_KAKARIKO_ADULT", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_INSIDE_DEKU_TREE, "Inside the Deku Tree", "NA_BGM_INSIDE_DEKU_TREE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_MARKET, "Market", "NA_BGM_MARKET", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_TITLE, "Title Theme", "NA_BGM_TITLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_LINK_HOUSE, "House", "NA_BGM_LINK_HOUSE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_JABU_JABU, "Inside Jabu-Jabu's Belly", "NA_BGM_JABU_JABU", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_KAKARIKO_KID, "Kakariko Village (Child)", "NA_BGM_KAKARIKO_KID", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_FIRE_TEMPLE, "Fire Temple", "NA_BGM_FIRE_TEMPLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_FOREST_TEMPLE, "Forest Temple", "NA_BGM_FOREST_TEMPLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_COURTYARD, "Hyrule Castle Courtyard", "NA_BGM_COURTYARD", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_GANON_TOWER, "Ganondorf's Theme", "NA_BGM_GANON_TOWER", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_LONLON, "Lon Lon Ranch", "NA_BGM_LONLON", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_GORON_CITY, "Goron City", "NA_BGM_GORON_CITY", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SARIA_THEME, "Lost Woods", "NA_BGM_SARIA_THEME", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SPIRIT_TEMPLE, "Spirit Temple", "NA_BGM_SPIRIT_TEMPLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_INGO, "Ingo's Theme", "NA_BGM_INGO", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_KOKIRI, "Kokiri Forest", "NA_BGM_KOKIRI", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_TEMPLE_OF_TIME, "Temple of Time", "NA_BGM_TEMPLE_OF_TIME", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_WINDMILL, "Windmill Hut", "NA_BGM_WINDMILL", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_FILE_SELECT, "File Select", "NA_BGM_FILE_SELECT", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ICE_CAVERN, "Ice Cavern", "NA_BGM_ICE_CAVERN", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ZORA_DOMAIN, "Zora's Domain", "NA_BGM_ZORA_DOMAIN", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SHOP, "Shop", "NA_BGM_SHOP", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SHADOW_TEMPLE, "Shadow Temple", "NA_BGM_SHADOW_TEMPLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_WATER_TEMPLE, "Water Temple", "NA_BGM_WATER_TEMPLE", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_UNDERGROUND, "Ganon's Castle Under Ground", "NA_BGM_UNDERGROUND", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_GERUDO_VALLEY, "Gerudo Valley", "NA_BGM_GERUDO_VALLEY", SEQ_BGM_WORLD, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_POTION_SHOP, "Potion Shop", "NA_BGM_POTION_SHOP", SEQ_BGM_WORLD, true, true), + + // SEQ_BGM_BATTLE + SEQUENCE_MAP_ENTRY(NA_BGM_ENEMY, "Battle", "NA_BGM_ENEMY", SEQ_BGM_BATTLE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_BOSS, "Boss Battle", "NA_BGM_BOSS", SEQ_BGM_BATTLE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_MINI_BOSS, "Mini-Boss Battle", "NA_BGM_MINI_BOSS", SEQ_BGM_BATTLE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_GANONDORF_BOSS, "Ganondorf Battle", "NA_BGM_GANONDORF_BOSS", SEQ_BGM_BATTLE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_GANON_BOSS, "Ganon Battle", "NA_BGM_GANON_BOSS", SEQ_BGM_BATTLE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_FIRE_BOSS, "King Dodongo & Volvagia Boss Battle", "NA_BGM_FIRE_BOSS", SEQ_BGM_BATTLE, true, true), + + // SEQ_BGM_FANFARE + SEQUENCE_MAP_ENTRY(NA_BGM_GAME_OVER, "Game Over", "NA_BGM_GAME_OVER", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_BOSS_CLEAR, "Boss Clear", "NA_BGM_BOSS_CLEAR", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ITEM_GET, "Obtain Item", "NA_BGM_ITEM_GET", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OPENING_GANON, "Enter Ganondorf", "NA_BGM_OPENING_GANON", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_HEART_GET, "Obtain Heart Container", "NA_BGM_HEART_GET", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OPEN_TRE_BOX, "Open Treasure Chest", "NA_BGM_OPEN_TRE_BOX", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SPIRITUAL_STONE, "Spiritual Stone Get", "NA_BGM_SPIRITUAL_STONE", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SMALL_ITEM_GET, "Obtain Small Item", "NA_BGM_SMALL_ITEM_GET", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_EVENT_CLEAR, "Escape from Lon Lon Ranch", "NA_BGM_EVENT_CLEAR", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_FAIRY_GET, "Obtain Fairy Ocarina", "NA_BGM_OCA_FAIRY_GET", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_HORSE_GOAL, "Horse Race Goal", "NA_BGM_HORSE_GOAL", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_MEDALLION_GET, "Obtain Medallion", "NA_BGM_MEDALLION_GET", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_APPEAR, "Enter Zelda", "NA_BGM_APPEAR", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_MASTER_SWORD, "Master Sword", "NA_BGM_MASTER_SWORD", SEQ_FANFARE, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCARINA_OF_TIME, "Ocarina of Time", "NA_BGM_OCARINA_OF_TIME", SEQ_FANFARE, true, true), + + // SEQ_OCARINA + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_LIGHT, "Prelude of Light", "NA_BGM_OCA_LIGHT", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_BOLERO, "Bolero of Fire", "NA_BGM_OCA_BOLERO", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_MINUET, "Minuet of Forest", "NA_BGM_OCA_MINUET", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SERENADE, "Serenade of Water", "NA_BGM_OCA_SERENADE", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_REQUIEM, "Requiem of Spirit", "NA_BGM_OCA_REQUIEM", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_NOCTURNE, "Nocturne of Shadow", "NA_BGM_OCA_NOCTURNE", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SARIA, "Ocarina Saria's Song", "NA_BGM_OCA_SARIA", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_EPONA, "Ocarina Epona's Song", "NA_BGM_OCA_EPONA", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_ZELDA, "Ocarina Zelda's Lullaby", "NA_BGM_OCA_ZELDA", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_SUNS, "Ocarina Sun's Song", "NA_BGM_OCA_SUNS", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_TIME, "Ocarina Song of Time", "NA_BGM_OCA_TIME", SEQ_OCARINA, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OCA_STORM, "Ocarina Song of Storms", "NA_BGM_OCA_STORM", SEQ_OCARINA, true, true), + + // SEQ_BGM_EVENT + SEQUENCE_MAP_ENTRY(NA_BGM_GREAT_FAIRY, "Great Fairy's Fountain", "NA_BGM_GREAT_FAIRY", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ZELDA_THEME, "Zelda's Theme", "NA_BGM_ZELDA_THEME", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_HORSE, "Horse Race", "NA_BGM_HORSE", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_NAVI_OPENING, "Fairy Flying", "NA_BGM_NAVI_OPENING", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_DEKU_TREE_CS, "Deku Tree", "NA_BGM_DEKU_TREE_CS", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_HYRULE_CS, "Legend of Hyrule", "NA_BGM_HYRULE_CS", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_MINI_GAME, "Shooting Gallery", "NA_BGM_MINI_GAME", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_SHEIK, "Sheik's Theme", "NA_BGM_SHEIK", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ADULT_LINK, "Goodbye to Zelda", "NA_BGM_ADULT_LINK", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_INTRO_GANON, "Ganon Intro", "NA_BGM_INTRO_GANON", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_CHAMBER_OF_SAGES, "Chamber of the Sages", "NA_BGM_CHAMBER_OF_SAGES", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_DOOR_OF_TIME, "Open Door of Temple of Time", "NA_BGM_DOOR_OF_TIME", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_OWL, "Kaepora Gaebora's Theme", "NA_BGM_OWL", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_BRIDGE_TO_GANONS, "Ganon's Castle Bridge", "NA_BGM_BRIDGE_TO_GANONS", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_KOTAKE_KOUME, "Kotake & Koume's Theme", "NA_BGM_KOTAKE_KOUME", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_ESCAPE, "Escape from Ganon's Castle", "NA_BGM_ESCAPE", SEQ_BGM_EVENT, true, true), + SEQUENCE_MAP_ENTRY(NA_BGM_TIMED_MINI_GAME, "Mini-Game", "NA_BGM_TIMED_MINI_GAME", SEQ_BGM_EVENT, true, true), + + // Previously SEQ_NOSHUFFLE + SEQUENCE_MAP_ENTRY(NA_BGM_FIELD_MORNING, "Hyrule Field Morning Theme", "NA_BGM_FIELD_MORNING", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? + SEQUENCE_MAP_ENTRY(NA_BGM_END_DEMO, "Seal of Six Sages", "NA_BGM_END_DEMO", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? + SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_1, "End Credits I", "NA_BGM_STAFF_1", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? + SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_2, "End Credits II", "NA_BGM_STAFF_2", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? + SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_3, "End Credits III", "NA_BGM_STAFF_3", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere? + 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, 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), + SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BOUND, "Bomb Bounce", "NA_SE_EN_AWA_BOUND", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_SHADEST_TAIKO_LOW, "Bongo Bongo Low", "NA_SE_EN_SHADEST_TAIKO_LOW", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_FAINT, "Business Scrub", "NA_SE_EN_NUTS_FAINT", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_CARROT_RECOVER, "Carrot Refill", "NA_SE_SY_CARROT_RECOVER", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_N, "Cluck", "NA_SE_EV_CHICKEN_CRY_N", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_BRIDGE_OPEN_STOP, "Drawbridge Set", "NA_SE_EV_BRIDGE_OPEN_STOP", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_KAICHO_CRY, "Guay", "NA_SE_EN_KAICHO_CRY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_HITPOINT_ALARM, "Low HP Beep", "NA_SE_SY_HITPOINT_ALARM", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_HP_RECOVER, "HP Recover", "NA_SE_SY_HP_RECOVER", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_HORSE_RUN, "Horse Trot", "NA_SE_EV_HORSE_RUN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_PL_WALK_HEAVYBOOTS, "Iron Boots", "NA_SE_PL_WALK_HEAVYBOOTS", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_PL_HOBBERBOOTS_LV - SFX_FLAG, "Hover Boots", "NA_SE_PL_HOBBERBOOTS_LV", SEQ_SFX, true, false), + SEQUENCE_MAP_ENTRY(NA_SE_EV_COW_CRY, "Moo", "NA_SE_EV_COW_CRY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_POT_BROKEN, "Pot Shattering", "NA_SE_EV_POT_BROKEN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_FROG_CRY_0, "Ribbit", "NA_SE_EV_FROG_CRY_0", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_FIVE_COUNT_LUPY, "Rupee (Silver)", "NA_SE_EV_FIVE_COUNT_LUPY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_FOOT_SWITCH, "Switch", "NA_SE_EV_FOOT_SWITCH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_IT_WALL_HIT_SOFT, "Sword Bonk", "NA_SE_IT_WALL_HIT_SOFT", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_METRONOME, "Tambourine", "NA_SE_SY_METRONOME", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_AMOS_VOICE, "Armos", "NA_SE_EN_AMOS_VOICE", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_REDEAD_AIM, "Redead Scream", "NA_SE_EN_REDEAD_AIM", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_STALKID_ATTACK, "Stalchild Attack", "NA_SE_EN_STALKID_ATTACK", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_M, "Cockadoodiedoo", "NA_SE_EV_CHICKEN_CRY_M", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_KINSTA_MARK_APPEAR, "Gold Skulltula Token", "NA_SE_SY_KINSTA_MARK_APPEAR", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_REDEAD_CRY, "Redead Moan", "NA_SE_EN_REDEAD_CRY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_LIGHTNING, "Thunder", "NA_SE_EV_LIGHTNING", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_OC_ABYSS, "Cartoon Fall", "NA_SE_OC_ABYSS", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_FLAME_LAUGH, "Flare Dancer Laugh", "NA_SE_EN_FLAME_LAUGH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BREAK, "Shabom Pop", "NA_SE_EN_AWA_BREAK", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_SHADEST_TAIKO_HIGH, "Bongo Bongo High", "NA_SE_EN_SHADEST_TAIKO_HIGH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_BOTTLE_CAP_OPEN, "Bottle Cork", "NA_SE_EV_BOTTLE_CAP_OPEN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_IT_BOW_FLICK, "Bow Twang", "NA_SE_IT_BOW_FLICK", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_BUBLE_LAUGH, "Bubble Laugh", "NA_SE_EN_BUBLE_LAUGH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_DEKU_JR_MOUTH, "Deku Baba", "NA_SE_EN_DEKU_JR_MOUTH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_DOG_CRY_EVENING, "Dusk Howl", "NA_SE_EV_DOG_CRY_EVENING", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_FLAME_DAMAGE, "Flare Dancer Startled", "NA_SE_EN_FLAME_DAMAGE", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_GANON_AT_RETURN, "Ganondorf Teh!", "NA_SE_EN_GANON_AT_RETURN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_GOMA_JR_CRY, "Gohma Larva Croak", "NA_SE_EN_GOMA_JR_CRY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_GOLON_WAKE_UP, "Goron Wake", "NA_SE_EN_GOLON_WAKE_UP", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_START_SHOT, "Gunshot", "NA_SE_SY_START_SHOT", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_IT_HAMMER_HIT, "Hammer Bonk", "NA_SE_IT_HAMMER_HIT", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_IRONNACK_SWING_AXE, "Iron Knuckle", "NA_SE_EN_IRONNACK_SWING_AXE", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_FANTOM_ST_LAUGH, "Phantom Ganon Laugh", "NA_SE_EN_FANTOM_ST_LAUGH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_PLANT_BROKEN, "Plant Explode", "NA_SE_EV_PLANT_BROKEN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_GET_RUPY, "Rupee", "NA_SE_SY_GET_RUPY", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_UP, "Scrub Emerge", "NA_SE_EN_NUTS_UP", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_AWA_BOUND, "Shabom Bounce", "NA_SE_EN_AWA_BOUND", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_SHELL_MOUTH, "Shellblade", "NA_SE_EN_SHELL_MOUTH", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_STALTU_DAMAGE, "Skulltula Damage", "NA_SE_EN_STALTU_DAMAGE", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EN_NUTS_THROW, "Spit Nut", "NA_SE_EN_NUTS_THROW", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_LOCK_ON, "Target Enemy", "NA_SE_SY_LOCK_ON", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_LOCK_ON_HUMAN, "Target Neutral", "NA_SE_SY_LOCK_ON_HUMAN", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_CURSOR, "File Select Cursor", "NA_SE_SY_FSEL_CURSOR", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_DECIDE_L, "File Select Choose", "NA_SE_SY_FSEL_DECIDE_L", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_SY_FSEL_CLOSE, "File Select Back", "NA_SE_SY_FSEL_CLOSE", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_IT_BOMB_EXPLOSION, "Bomb Explosion", "NA_SE_IT_BOMB_EXPLOSION", SEQ_SFX, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_EV_CHICKEN_CRY_A, "Chicken Cry", "NA_SE_EV_CHICKEN_CRY_A", SEQ_SFX, true, true), + + // SEQ_VOICE + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_N, "Adult Link - Slash", "NA_SE_VO_LI_SWORD_N", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_L, "Adult Link - Big Slash", "NA_SE_VO_LI_SWORD_L", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LASH, "Adult Link - Hookshot Latch Yell", "NA_SE_VO_LI_LASH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HANG, "Adult Link - Dangling Gasp", "NA_SE_VO_LI_HANG", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_CLIMB_END, "Adult Link - Climb Edge", "NA_SE_VO_LI_CLIMB_END", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DAMAGE_S, "Adult Link - Small Damage", "NA_SE_VO_LI_DAMAGE_S", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FREEZE, "Adult Link - Freeze", "NA_SE_VO_LI_FREEZE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_S, "Adult Link - Fall Gasp", "NA_SE_VO_LI_FALL_S", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_L, "Adult Link - Fall Scream", "NA_SE_VO_LI_FALL_L", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_REST, "Adult Link - Low Health Sigh", "NA_SE_VO_LI_BREATH_REST", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_DRINK, "Adult Link - Bottle Sigh", "NA_SE_VO_LI_BREATH_DRINK", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DOWN, "Adult Link - Death", "NA_SE_VO_LI_DOWN", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_TAKEN_AWAY, "Adult Link - Taken away by Wallmaster", "NA_SE_VO_LI_TAKEN_AWAY", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HELD, "Adult Link - Grabbed by Wallmaster", "NA_SE_VO_LI_HELD", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SNEEZE, "Adult Link - Sneeze", "NA_SE_VO_LI_SNEEZE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWEAT, "Adult Link - Gasp (Hot Room)", "NA_SE_VO_LI_SWEAT", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_RELAX, "Adult Link - Yawn", "NA_SE_VO_LI_RELAX", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_PUTAWAY, "Adult Link - Yell (Sword Putaway)", "NA_SE_VO_LI_SWORD_PUTAWAY", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP, "Adult Link - Jump/Swing Bottle", "NA_SE_VO_LI_AUTOd_JUMP", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_NALE, "Adult Link - Use Nayru's Love", "NA_SE_VO_LI_MAGIC_NALE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SURPRISE, "Adult Link - Suprised Gasp", "NA_SE_VO_LI_SURPRISE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_FROL, "Adult Link - Use Farore's Wind", "NA_SE_VO_LI_MAGIC_FROL", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_PUSH, "Adult Link - Push", "NA_SE_VO_LI_PUSH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HOOKSHOT_HANG, "Adult Link - Hookshot hang", "NA_SE_VO_LI_HOOKSHOT_HANG", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LAND_DAMAGE_S, "Adult Link - Fall damage", "NA_SE_VO_LI_LAND_DAMAGE_S", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_NULL_0x1b, "Adult Link - Small grunt (unused?)", "NA_SE_VO_LI_NULL_0x1b", SEQ_VOICE, true, true), // Unused? But unique so keeping it + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_ATTACK, "Adult Link - Din's Fire", "NA_SE_VO_LI_MAGIC_ATTACK", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_BL_DOWN, "Adult Link - Scream (Nocturne?)", "NA_SE_VO_BL_DOWN", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DEMO_DAMAGE, "Adult Link - Pained Land (Nocturne?)", "NA_SE_VO_LI_DEMO_DAMAGE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_N_KID, "Child Link - Slash", "NA_SE_VO_LI_SWORD_N_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_ROLLING_CUT_KID, "Child Link - Big Slash", "NA_SE_VO_LI_ROLLING_CUT_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LASH_KID, "Child Link - Hootshot Latch", "NA_SE_VO_LI_LASH_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HANG_KID, "Child Link - Dangling Gasp", "NA_SE_VO_LI_HANG_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_CLIMB_END_KID, "Child Link - Climb Edge", "NA_SE_VO_LI_CLIMB_END_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DAMAGE_S_KID, "Child Link - Small Damage", "NA_SE_VO_LI_DAMAGE_S_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FREEZE_KID, "Child Link - Freeze", "NA_SE_VO_LI_FREEZE_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_S_KID, "Child Link - Fall Gasp", "NA_SE_VO_LI_FALL_S_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_FALL_L_KID, "Child Link - Fall Scream", "NA_SE_VO_LI_FALL_L_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_REST_KID, "Child Link - Low Health Sigh", "NA_SE_VO_LI_BREATH_REST_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_BREATH_DRINK_KID, "Child Link - Bottle Sigh", "NA_SE_VO_LI_BREATH_DRINK_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DOWN_KID, "Child Link - Death", "NA_SE_VO_LI_DOWN_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_TAKEN_AWAY_KID, "Child Link - Taken away by Wallmaster", "NA_SE_VO_LI_TAKEN_AWAY_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HELD_KID, "Child Link - Grabbed by Wallmaster", "NA_SE_VO_LI_HELD_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SNEEZE_KID, "Child Link - Sneeze", "NA_SE_VO_LI_SNEEZE_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWEAT_KID, "Child Link - Gasp (Hot Room)", "NA_SE_VO_LI_SWEAT_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_RELAX_KID, "Child Link - Yawn", "NA_SE_VO_LI_RELAX_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SWORD_PUTAWAY_KID, "Child Link - Yell (Sword Putaway)", "NA_SE_VO_LI_SWORD_PUTAWAY_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP_KID, "Child Link - Jump/Swing Bottle", "NA_SE_VO_LI_AUTO_JUMP_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_NALE_KID, "Child Link - Use Nayru's Love", "NA_SE_VO_LI_MAGIC_NALE_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_SURPRISE_KID, "Child Link - Surprised Gasp", "NA_SE_VO_LI_SURPRISE_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_FROL_KID, "Child Link - Use Farore's Wind", "NA_SE_VO_LI_MAGIC_FROL_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_PUSH_KID, "Child Link - Push", "NA_SE_VO_LI_PUSH_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_HOOKSHOT_HANG_KID, "Child Link - Hookshot Hang", "NA_SE_VO_LI_HOOKSHOT_HANG_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_LAND_DAMAGE_S_KID, "Child Link - Fall Damage", "NA_SE_VO_LI_LAND_DAMAGE_S_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_NULL_0x1b_KID, "Child Link - Small Gasp (unused?)", "NA_SE_VO_LI_NULL_0x1b_KID", SEQ_VOICE, true, true), // Unused? But unique so keeping it + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_MAGIC_ATTACK_KID, "Child Link - Din's Fire", "NA_SE_VO_LI_MAGIC_ATTACK_KID", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_BL_DOWN_KID, "Child Link - Scream (Nocturne?)", "NA_SE_VO_BL_DOWN_KID", SEQ_VOICE, true, true), // ... + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DEMO_DAMAGE_KID, "Child Link - Scream 2 (Nocturne?)", "NA_SE_VO_LI_DEMO_DAMAGE_KID", SEQ_VOICE, true, true), // Unused, matches with adult nocturne stuff + SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_ENEMY, "Navi - Unused Enemy Target", "NA_SE_VO_NAVY_ENEMY", SEQ_VOICE, true, true), // Has no sound but is played when targetting enemies, unsure to keep or not + SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_HELLO, "Navi - Unused NPC Hello", "NA_SE_VO_NAVY_HELLO", SEQ_VOICE, true, true), // Has no sound but is played when targetting npcs, unsure to keep or not + SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_HEAR, "Navi - Unused Other Target", "NA_SE_VO_NAVY_HEAR", SEQ_VOICE, true, true), // Has no sound but is played when targetting npcs, unsure to keep or not + SEQUENCE_MAP_ENTRY(NA_SE_VO_NAVY_CALL, "Navi - Look/Hey/Watchout (Target Enemy)", "NA_SE_VO_NAVY_CALL", SEQ_VOICE, true, true), // Has no sound but is played when targetting signs and other things, unsure to keep or not + SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_3, "Navi - Hello", "NA_SE_VO_NA_HELLO_3", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_SLEEP, "Talon - Snore", "NA_SE_VO_TA_SLEEP", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_SURPRISE, "Talon - Surprised", "NA_SE_VO_TA_SURPRISE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_CRY_0, "Talon - Hmm", "NA_SE_VO_TA_CRY_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_CRY_1, "Talon - Scream", "NA_SE_VO_TA_CRY_1", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_CRY_0, "Ingo - WAAAH!", "NA_SE_VO_IN_CRY_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LOST, "Ingo - KAAAAH! (Lost)", "NA_SE_VO_IN_LOST", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LASH_0, "Ingo - Heyeah (Horse 1)", "NA_SE_VO_IN_LASH_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LASH_1, "Ingo - Ha (Horse 2)", "NA_SE_VO_IN_LASH_1", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_FR_LAUGH_0, "Great Fairy - Big Laugh", "NA_SE_VO_FR_LAUGH_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_FR_SMILE_0, "Great Fairy - Small Laugh", "NA_SE_VO_FR_SMILE_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_AGONY, "Nabooru - Pained Gasp", "NA_SE_VO_NB_AGONY", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_CRY_0, "Nabooru - Scream", "NA_SE_VO_NB_CRY_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_NOTICE, "Nabooru - Hmm?", "NA_SE_VO_NB_NOTICE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_0, "Navi - Watchout!", "NA_SE_VO_NA_HELLO_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_1, "Navi - Look!", "NA_SE_VO_NA_HELLO_1", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_2, "Navi - Hey! (C-up Sound)", "NA_SE_VO_NA_HELLO_2", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_CRASH, "Ruto - Crash", "NA_SE_VO_RT_CRASH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_DISCOVER, "Ruto - Found", "NA_SE_VO_RT_DISCOVER", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_FALL, "Ruto - Fall", "NA_SE_VO_RT_FALL", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_LAUGH_0, "Ruto - Giggle", "NA_SE_VO_RT_LAUGH_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_LIFT, "Ruto - Lifted/Navi - Intro Bonk", "NA_SE_VO_RT_LIFT", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_THROW, "Ruto - Thrown", "NA_SE_VO_RT_THROW", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_UNBALLANCE, "Ruto - Held Tantrum", "NA_SE_VO_RT_UNBALLANCE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_ST_DAMAGE, "Cursed Man - Scream", "NA_SE_VO_ST_DAMAGE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_ST_ATTACK, "Cursed Man - Gasp", "NA_SE_VO_ST_ATTACK", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_HURRY, "Child Zelda - Hurry", "NA_SE_VO_Z0_HURRY", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_MEET, "Child Zelda - Meeting Link Gasp", "NA_SE_VO_Z0_MEET", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_QUESTION, "Child Zelda - Question", "NA_SE_VO_Z0_QUESTION", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SIGH_0, "Child Zelda - Sigh", "NA_SE_VO_Z0_SIGH_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SMILE_0, "Child Zelda - Laugh", "NA_SE_VO_Z0_SMILE_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SURPRISE, "Child Zelda - Sees Ganon Gasp", "NA_SE_VO_Z0_SURPRISE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_THROW, "Child Zelda - Throws Ocarina", "NA_SE_VO_Z0_THROW", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRY_0, "Sheik - Pained Gasp (Nocturne)", "NA_SE_VO_SK_CRY_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRY_1, "Sheik - Pained Scream (Nocturne)", "NA_SE_VO_SK_CRY_1", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRASH, "Sheik - Pained Landing (Nocturne)", "NA_SE_VO_SK_CRASH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_LAUGH, "Navi - Listen!", "NA_SE_VO_SK_LAUGH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_SHOUT, "Sheik - Shout (Throwing Deku Nut)", "NA_SE_VO_SK_SHOUT", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_CRY_0, "Adult Zelda - Scream 1", "NA_SE_VO_Z1_CRY_0", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_CRY_1, "Adult Zelda - Scream 2", "NA_SE_VO_Z1_CRY_1", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_OPENDOOR, "Adult Zelda - Open Seseme Magic Gasp", "NA_SE_VO_Z1_OPENDOOR", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_SURPRISE, "Adult Zelda - Gasp", "NA_SE_VO_Z1_SURPRISE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_PAIN, "Adult Zelda - Pained Gasp", "NA_SE_VO_Z1_PAIN", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_KZ_MOVE, "King Zora - Mweep!", "NA_SE_VO_KZ_MOVE", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_LAUGH, "Navi - Hello!", "NA_SE_VO_NB_LAUGH", SEQ_VOICE, true, true), + SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DRINK - SFX_FLAG, "Adult Link - Drinking", "NA_SE_VO_LI_DRINK", SEQ_VOICE, true, false), + + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DRINK, "Adult Link - Drinking", "NA_SE_VO_LI_DRINK", SEQ_VOICE, true, false), // Doesn't work due to SFX_FLAG + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_DRINK_KID, "Child Link - Drinking", "NA_SE_VO_LI_DRINK_KID", SEQ_VOICE, true, false), // Doesn't work due to SFX_FLAG + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_GROAN, "Adult Link - Groan (Unused)", "NA_SE_VO_LI_GROAN", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY("Adult Link - Unused Sound 1?","NA_SE_VO_LI_ELECTRIC_SHOCK_LV", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_GROAN_KID, "Child Link - Groan (Unused)", "NA_SE_VO_LI_GROAN_KID", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID, "Child Link - Unused Sound 1?", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID", SEQ_VOICE, true, false), + // Following group of Dummies are all duplicate entries for Navi saying Look/Hey/Watchout - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x45, "NA_SE_VO_DUMMY_0x45", "NA_SE_VO_DUMMY_0x45", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x46, "NA_SE_VO_DUMMY_0x46", "NA_SE_VO_DUMMY_0x46", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x47, "NA_SE_VO_DUMMY_0x47", "NA_SE_VO_DUMMY_0x47", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x48, "NA_SE_VO_DUMMY_0x48", "NA_SE_VO_DUMMY_0x48", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x49, "NA_SE_VO_DUMMY_0x49", "NA_SE_VO_DUMMY_0x49", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4a "NA_SE_VO_DUMMY_0x4a", "NA_SE_VO_DUMMY_0x4a", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4b, "NA_SE_VO_DUMMY_0x4b", "NA_SE_VO_DUMMY_0x4b", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4c, "NA_SE_VO_DUMMY_0x4c", "NA_SE_VO_DUMMY_0x4c", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4d, "NA_SE_VO_DUMMY_0x4d", "NA_SE_VO_DUMMY_0x4d", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4e, "NA_SE_VO_DUMMY_0x4e", "NA_SE_VO_DUMMY_0x4e", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4f, "NA_SE_VO_DUMMY_0x4f", "NA_SE_VO_DUMMY_0x4f", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_SLEEP, "Talon - Snore", "NA_SE_VO_TA_SLEEP", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_SURPRISE, "Talon - Surprised", "NA_SE_VO_TA_SURPRISE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_CRY_0, "Talon - Hmm", "NA_SE_VO_TA_CRY_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_TA_CRY_1, "Talon - Scream", "NA_SE_VO_TA_CRY_1", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_CRY_0, "Ingo - WAAAH!", "NA_SE_VO_IN_CRY_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LOST, "Ingo - KAAAAH! (Lost)", "NA_SE_VO_IN_LOST", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LASH_0, "Ingo - Heyeah (Horse 1)", "NA_SE_VO_IN_LASH_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LASH_1, "Ingo - Ha (Horse 2)", "NA_SE_VO_IN_LASH_1", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_FR_LAUGH_0, "Great Fairy - Big Laugh", "NA_SE_VO_FR_LAUGH_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_FR_SMILE_0, "Great Fairy - Small Laugh", "NA_SE_VO_FR_SMILE_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_AGONY, "Nabooru - Pained Gasp", "NA_SE_VO_NB_AGONY", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_CRY_0, "Nabooru - Scream", "NA_SE_VO_NB_CRY_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_NOTICE, "Nabooru - Hmm?", "NA_SE_VO_NB_NOTICE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_0, "Navi - Watchout!", "NA_SE_VO_NA_HELLO_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_1, "Navi - Look!", "NA_SE_VO_NA_HELLO_1", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NA_HELLO_2, "Navi - Hey! (C-up Sound)", "NA_SE_VO_NA_HELLO_2", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_CRASH, "Ruto - Crash", "NA_SE_VO_RT_CRASH", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_DISCOVER, "Ruto - Found", "NA_SE_VO_RT_DISCOVER", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_FALL, "Ruto - Fall", "NA_SE_VO_RT_FALL", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_LAUGH_0, "Ruto - Giggle", "NA_SE_VO_RT_LAUGH_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_LIFT, "Ruto - Lifted/Navi - Intro Bonk", "NA_SE_VO_RT_LIFT", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_THROW, "Ruto - Thrown", "NA_SE_VO_RT_THROW", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_RT_UNBALLANCE, "Ruto - Held Tantrum", "NA_SE_VO_RT_UNBALLANCE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_ST_DAMAGE, "Cursed Man - Scream", "NA_SE_VO_ST_DAMAGE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_ST_ATTACK, "Cursed Man - Gasp", "NA_SE_VO_ST_ATTACK", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_HURRY, "Child Zelda - Hurry", "NA_SE_VO_Z0_HURRY", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_MEET, "Child Zelda - Meeting Link Gasp", "NA_SE_VO_Z0_MEET", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_QUESTION, "Child Zelda - Question", "NA_SE_VO_Z0_QUESTION", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SIGH_0, "Child Zelda - Sigh", "NA_SE_VO_Z0_SIGH_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SMILE_0, "Child Zelda - Laugh", "NA_SE_VO_Z0_SMILE_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_SURPRISE, "Child Zelda - Sees Ganon Gasp", "NA_SE_VO_Z0_SURPRISE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z0_THROW, "Child Zelda - Throws Ocarina", "NA_SE_VO_Z0_THROW", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRY_0, "Sheik - Pained Gasp (Nocturne)", "NA_SE_VO_SK_CRY_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRY_1, "Sheik - Pained Scream (Nocturne)", "NA_SE_VO_SK_CRY_1", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_CRASH, "Sheik - Pained Landing (Nocturne)", "NA_SE_VO_SK_CRASH", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_LAUGH, "Navi - Listen!", "NA_SE_VO_SK_LAUGH", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_SK_SHOUT, "Sheik - Shout (Throwing Deku Nut)", "NA_SE_VO_SK_SHOUT", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_CRY_0, "Adult Zelda - Scream 1", "NA_SE_VO_Z1_CRY_0", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_CRY_1, "Adult Zelda - Scream 2", "NA_SE_VO_Z1_CRY_1", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_OPENDOOR, "Adult Zelda - Open Seseme Magic Gasp","NA_SE_VO_Z1_OPENDOOR", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_SURPRISE, "Adult Zelda - Gasp", "NA_SE_VO_Z1_SURPRISE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_Z1_PAIN, "Adult Zelda - Pained Gasp", "NA_SE_VO_Z1_PAIN", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_KZ_MOVE, "King Zora - Mweep!", "NA_SE_VO_KZ_MOVE", SEQ_VOICE), - SEQUENCE_MAP_ENTRY(NA_SE_VO_NB_LAUGH, "Navi - Hello!", "NA_SE_VO_NB_LAUGH", SEQ_VOICE), - //SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LAUGH, "NA_SE_VO_IN_LAUGH", "NA_SE_VO_IN_LAUGH", SEQ_VOICE), // Crashes - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7d, "NA_SE_VO_DUMMY_0x7d", "NA_SE_VO_DUMMY_0x7d", SEQ_VOICE), // Unused weird Child Link sound - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7e, "NA_SE_VO_DUMMY_0x7e", "NA_SE_VO_DUMMY_0x7e", SEQ_VOICE), // Unused weird Child Link sound - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7f, "NA_SE_VO_DUMMY_0x7f", "NA_SE_VO_DUMMY_0x7f", SEQ_VOICE), // Unused weird Child Link sound - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x80, "NA_SE_VO_DUMMY_0x80", "NA_SE_VO_DUMMY_0x80", SEQ_VOICE), // Unused and empty - //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP_DARKLINK,"NA_SE_VO_LI_AUTO_JUMP_DARKLINK", "NA_SE_VO_LI_AUTO_JUMP_DARKLINK", SEQ_VOICE), // Implies Dark Link but isn't used in anything - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x82_YOBI, "NA_SE_VO_DUMMY_0x82_YOBI", "NA_SE_VO_DUMMY_0x82_YOBI", SEQ_VOICE), // Rest are unused and empty - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x83_YOBI, "NA_SE_VO_DUMMY_0x83_YOBI", "NA_SE_VO_DUMMY_0x83_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x84_YOBI, "NA_SE_VO_DUMMY_0x84_YOBI", "NA_SE_VO_DUMMY_0x84_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x85_YOBI, "NA_SE_VO_DUMMY_0x85_YOBI", "NA_SE_VO_DUMMY_0x85_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x86_YOBI, "NA_SE_VO_DUMMY_0x86_YOBI", "NA_SE_VO_DUMMY_0x86_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x87_YOBI, "NA_SE_VO_DUMMY_0x87_YOBI", "NA_SE_VO_DUMMY_0x87_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x88_YOBI, "NA_SE_VO_DUMMY_0x88_YOBI", "NA_SE_VO_DUMMY_0x88_YOBI", SEQ_VOICE), // .. - //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x89_YOBI, "NA_SE_VO_DUMMY_0x89_YOBI", "NA_SE_VO_DUMMY_0x89_YOBI", SEQ_VOICE), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x45, "NA_SE_VO_DUMMY_0x45", "NA_SE_VO_DUMMY_0x45", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x46, "NA_SE_VO_DUMMY_0x46", "NA_SE_VO_DUMMY_0x46", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x47, "NA_SE_VO_DUMMY_0x47", "NA_SE_VO_DUMMY_0x47", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x48, "NA_SE_VO_DUMMY_0x48", "NA_SE_VO_DUMMY_0x48", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x49, "NA_SE_VO_DUMMY_0x49", "NA_SE_VO_DUMMY_0x49", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4a "NA_SE_VO_DUMMY_0x4a", "NA_SE_VO_DUMMY_0x4a", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4b, "NA_SE_VO_DUMMY_0x4b", "NA_SE_VO_DUMMY_0x4b", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4c, "NA_SE_VO_DUMMY_0x4c", "NA_SE_VO_DUMMY_0x4c", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4d, "NA_SE_VO_DUMMY_0x4d", "NA_SE_VO_DUMMY_0x4d", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4e, "NA_SE_VO_DUMMY_0x4e", "NA_SE_VO_DUMMY_0x4e", SEQ_VOICE, true, false), + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x4f, "NA_SE_VO_DUMMY_0x4f", "NA_SE_VO_DUMMY_0x4f", SEQ_VOICE, true, false), + + //SEQUENCE_MAP_ENTRY(NA_SE_VO_IN_LAUGH, "NA_SE_VO_IN_LAUGH", "NA_SE_VO_IN_LAUGH", SEQ_VOICE, true, false), // Crashes + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7d, "NA_SE_VO_DUMMY_0x7d", "NA_SE_VO_DUMMY_0x7d", SEQ_VOICE, true, false), // Unused weird Child Link sound + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7e, "NA_SE_VO_DUMMY_0x7e", "NA_SE_VO_DUMMY_0x7e", SEQ_VOICE, true, false), // Unused weird Child Link sound + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x7f, "NA_SE_VO_DUMMY_0x7f", "NA_SE_VO_DUMMY_0x7f", SEQ_VOICE, true, false), // Unused weird Child Link sound + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x80, "NA_SE_VO_DUMMY_0x80", "NA_SE_VO_DUMMY_0x80", SEQ_VOICE, true, false), // Unused and empty + //SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_AUTO_JUMP_DARKLINK,"NA_SE_VO_LI_AUTO_JUMP_DARKLINK", "NA_SE_VO_LI_AUTO_JUMP_DARKLINK", SEQ_VOICE, true, false), // Implies Dark Link but isn't used in anything + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x82_YOBI, "NA_SE_VO_DUMMY_0x82_YOBI", "NA_SE_VO_DUMMY_0x82_YOBI", SEQ_VOICE, true, false), // Rest are unused and empty + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x83_YOBI, "NA_SE_VO_DUMMY_0x83_YOBI", "NA_SE_VO_DUMMY_0x83_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x84_YOBI, "NA_SE_VO_DUMMY_0x84_YOBI", "NA_SE_VO_DUMMY_0x84_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x85_YOBI, "NA_SE_VO_DUMMY_0x85_YOBI", "NA_SE_VO_DUMMY_0x85_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x86_YOBI, "NA_SE_VO_DUMMY_0x86_YOBI", "NA_SE_VO_DUMMY_0x86_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x87_YOBI, "NA_SE_VO_DUMMY_0x87_YOBI", "NA_SE_VO_DUMMY_0x87_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x88_YOBI, "NA_SE_VO_DUMMY_0x88_YOBI", "NA_SE_VO_DUMMY_0x88_YOBI", SEQ_VOICE, true, false), // .. + //SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x89_YOBI, "NA_SE_VO_DUMMY_0x89_YOBI", "NA_SE_VO_DUMMY_0x89_YOBI", SEQ_VOICE, true, false), // .. }; } @@ -331,7 +353,7 @@ void AudioCollection::AddToCollection(char* otrPath, uint16_t seqNum) { SequenceInfo info = {seqNum, sequenceName, StringHelper::Replace(StringHelper::Replace(StringHelper::Replace(sequenceName, " ", "_"), "~", "-"),".", ""), - type}; + type, false, true}; sequenceMap.emplace(seqNum, info); } @@ -379,12 +401,10 @@ void AudioCollection::InitializeShufflePool() { for (auto& [seqId, seqInfo] : sequenceMap) { const std::string cvarKey = "gAudioEditor.Excluded." + seqInfo.sfxKey; - if (CVarGetInteger(cvarKey.c_str(), 0)) { + if (CVarGetInteger(cvarKey.c_str(), 0) && !seqInfo.canBeUsedAsReplacement) { excludedSequences.insert(&seqInfo); } else { - if (seqInfo.category != SEQ_NOSHUFFLE) { - includedSequences.insert(&seqInfo); - } + includedSequences.insert(&seqInfo); } } diff --git a/soh/soh/Enhancements/audio/AudioCollection.h b/soh/soh/Enhancements/audio/AudioCollection.h index c60a7e739..1d53777e7 100644 --- a/soh/soh/Enhancements/audio/AudioCollection.h +++ b/soh/soh/Enhancements/audio/AudioCollection.h @@ -25,6 +25,8 @@ struct SequenceInfo { std::string label; std::string sfxKey; SeqType category; + bool canBeReplaced; + bool canBeUsedAsReplacement; }; class AudioCollection { diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp index 0e7244122..8b0615a83 100644 --- a/soh/soh/Enhancements/audio/AudioEditor.cpp +++ b/soh/soh/Enhancements/audio/AudioEditor.cpp @@ -27,7 +27,7 @@ s8 reverbAdd = 0; #define SEQ_COUNT_BGM_EVENT 17 #define SEQ_COUNT_INSTRUMENT 6 #define SEQ_COUNT_SFX 57 -#define SEQ_COUNT_VOICE 107 +#define SEQ_COUNT_VOICE 108 size_t AuthenticCountBySequenceType(SeqType type) { switch (type) { @@ -82,7 +82,7 @@ void RandomizeGroup(SeqType type) { // use a while loop to add duplicates if we don't have enough included sequences while (values.size() < AuthenticCountBySequenceType(type)) { for (const auto& seqData : AudioCollection::Instance->GetIncludedSequences()) { - if (seqData->category & type) { + if (seqData->category & type && seqData->canBeUsedAsReplacement) { values.push_back(seqData->sequenceId); } } @@ -97,7 +97,7 @@ void RandomizeGroup(SeqType type) { // don't randomize locked entries if ((seqData.category & type) && CVarGetInteger(cvarLockKey.c_str(), 0) == 0) { // Only save authentic sequence CVars - if (((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) && seqData.sequenceId >= MAX_AUTHENTIC_SEQID) { + if ((((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) && seqData.sequenceId >= MAX_AUTHENTIC_SEQID) || seqData.canBeReplaced == false) { continue; } const int randomValue = values.back(); @@ -194,10 +194,11 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) { continue; } // Do not display custom sequences in the list - if (((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) && defaultValue >= MAX_AUTHENTIC_SEQID) { + if ((((seqData.category & SEQ_BGM_CUSTOM) || seqData.category == SEQ_FANFARE) && defaultValue >= MAX_AUTHENTIC_SEQID) || seqData.canBeReplaced == false) { continue; } + const std::string initialSfxKey = seqData.sfxKey; const std::string cvarKey = AudioCollection::Instance->GetCvarKey(seqData.sfxKey); const std::string cvarLockKey = AudioCollection::Instance->GetCvarLockKey(seqData.sfxKey); const std::string hiddenKey = "##" + cvarKey; @@ -215,7 +216,8 @@ void Draw_SfxTab(const std::string& tabId, SeqType type) { const int initialValue = map.contains(currentValue) ? currentValue : defaultValue; if (ImGui::BeginCombo(hiddenKey.c_str(), map.at(initialValue).label.c_str())) { for (const auto& [value, seqData] : map) { - if (~(seqData.category) & type) { + // If excluded as a replacement sequence, don't show in other dropdowns except the effect's own dropdown. + if (~(seqData.category) & type || (!seqData.canBeUsedAsReplacement && initialSfxKey != seqData.sfxKey)) { continue; } @@ -401,6 +403,13 @@ void AudioEditor::DrawElement() { UIWidgets::InsertHelpHoverText( "Disables the music change when getting close to enemies. Useful for hearing " "your custom music for each scene more often."); + UIWidgets::EnhancementCheckbox("Disable Leading Music in Lost Woods", "gLostWoodsConsistentVolume"); + UIWidgets::InsertHelpHoverText( + "Disables the volume shifting in the Lost Woods. Useful for hearing " + "your custom music in the Lost Woods if you don't need the navigation assitance " + "the volume changing provides. If toggling this while in the Lost Woods, reload " + "the area for the effect to kick in." + ); UIWidgets::EnhancementCheckbox("Display Sequence Name on Overlay", "gSeqNameOverlay"); UIWidgets::InsertHelpHoverText( "Displays the name of the current sequence in the corner of the screen whenever a new sequence " @@ -542,7 +551,7 @@ void AudioEditor::DrawElement() { ImGui::BeginChild("ChildIncludedSequences", ImVec2(0, -8)); for (auto seqInfo : AudioCollection::Instance->GetIncludedSequences()) { if (sequenceSearch.PassFilter(seqInfo->label.c_str()) && showType[seqInfo->category]) { - if (ImGui::ArrowButton(seqInfo->sfxKey.c_str(), ImGuiDir_Right)) { + if (ImGui::Button(std::string(ICON_FA_TIMES "##" + seqInfo->sfxKey).c_str())) { seqsToExclude.insert(seqInfo); } ImGui::SameLine(); @@ -566,7 +575,7 @@ void AudioEditor::DrawElement() { ImGui::BeginChild("ChildExcludedSequences", ImVec2(0, -8)); for (auto seqInfo : AudioCollection::Instance->GetExcludedSequences()) { if (sequenceSearch.PassFilter(seqInfo->label.c_str()) && showType[seqInfo->category]) { - if (ImGui::ArrowButton(seqInfo->sfxKey.c_str(), ImGuiDir_Left)) { + if (ImGui::Button(std::string(ICON_FA_PLUS "##" + seqInfo->sfxKey).c_str())) { seqsToInclude.insert(seqInfo); } ImGui::SameLine(); diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp index d35b8825e..e9d94c503 100644 --- a/soh/soh/Enhancements/boss-rush/BossRush.cpp +++ b/soh/soh/Enhancements/boss-rush/BossRush.cpp @@ -291,6 +291,7 @@ void BossRush_InitSave() { gSaveContext.playerName[i] = brPlayerName[i]; } + gSaveContext.questId = QUEST_BOSSRUSH; gSaveContext.isBossRushPaused = 1; gSaveContext.entranceIndex = 107; gSaveContext.cutsceneIndex = 0x8000; @@ -462,8 +463,8 @@ void BossRush_SetEquipment(uint8_t linkAge) { brCButtonSlots = { SLOT_STICK, SLOT_NUT, SLOT_BOMB, SLOT_NONE, SLOT_NONE, SLOT_NONE, SLOT_NONE }; - Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_KOKIRI); - Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_DEKU); + Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_KOKIRI); + Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_DEKU); // Set Adult equipment. } else { brButtonItems = { ITEM_SWORD_MASTER, ITEM_BOW, ITEM_HAMMER, ITEM_BOMB, @@ -471,9 +472,9 @@ void BossRush_SetEquipment(uint8_t linkAge) { brCButtonSlots = { SLOT_BOW, SLOT_HAMMER, SLOT_BOMB, SLOT_NONE, SLOT_NONE, SLOT_NONE, SLOT_NONE }; - Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_MASTER); - Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_MIRROR); - Inventory_ChangeEquipment(EQUIP_TUNIC, PLAYER_TUNIC_GORON + 1); // Game expects tunic + 1, don't ask me why. + Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER); + Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_MIRROR); + Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_GORON); } // Button Items diff --git a/soh/soh/Enhancements/controls/GameControlEditor.cpp b/soh/soh/Enhancements/controls/GameControlEditor.cpp index 3bd650637..935935c48 100644 --- a/soh/soh/Enhancements/controls/GameControlEditor.cpp +++ b/soh/soh/Enhancements/controls/GameControlEditor.cpp @@ -331,13 +331,14 @@ namespace GameControlEditor { void DrawLEDControlPanel(GameControlEditorWindow* window) { window->BeginGroupPanelPublic("LED Colors", ImGui::GetContentRegionAvail()); - static const char* ledSources[4] = { "Original Tunic Colors", "Cosmetics Tunic Colors", "Health Colors", "Custom" }; + 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) == 3) { + 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 }; diff --git a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp index 97b2921c6..8c2707453 100644 --- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp +++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp @@ -46,6 +46,7 @@ extern PlayState* gPlayState; #include "overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h" #include "objects/object_gjyo_objects/object_gjyo_objects.h" #include "textures/nintendo_rogo_static/nintendo_rogo_static.h" +#include "objects/object_gi_rabit_mask/object_gi_rabit_mask.h" void ResourceMgr_PatchGfxByName(const char* path, const char* patchName, int index, Gfx instruction); void ResourceMgr_PatchGfxCopyCommandByName(const char* path, const char* patchName, int destinationIndex, int sourceIndex); void ResourceMgr_UnpatchGfxByName(const char* path, const char* patchName); @@ -228,6 +229,7 @@ static std::map cosmeticOptions = { COSMETIC_OPTION("Equipment_BowHandle", "Bow Handle", GROUP_EQUIPMENT, ImVec4( 50, 150, 255, 255), false, true, true), COSMETIC_OPTION("Equipment_ChuFace", "Bombchu Face", GROUP_EQUIPMENT, ImVec4( 0, 100, 150, 255), false, true, true), COSMETIC_OPTION("Equipment_ChuBody", "Bombchu Body", GROUP_EQUIPMENT, ImVec4(180, 130, 50, 255), false, true, true), + COSMETIC_OPTION("Equipment_BunnyHood", "Bunny Hood", GROUP_EQUIPMENT, ImVec4(255, 235, 109, 255), false, true, true), COSMETIC_OPTION("Consumable_Hearts", "Hearts", GROUP_CONSUMABLE, ImVec4(255, 70, 50, 255), false, true, false), COSMETIC_OPTION("Consumable_HeartBorder", "Heart Border", GROUP_CONSUMABLE, ImVec4( 50, 40, 60, 255), false, true, true), @@ -916,6 +918,26 @@ void ApplyOrResetCustomGfxPatches(bool manualChange) { PATCH_GFX(gBombchuDL, "Equipment_ChuBody5", equipmentChuBody.changedCvar, 46, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255)); } + static CosmeticOption& equipmentBunnyHood = cosmeticOptions.at("Equipment_BunnyHood"); + if (manualChange || CVarGetInteger(equipmentBunnyHood.rainbowCvar, 0)) { + static Color_RGBA8 defaultColor = {equipmentBunnyHood.defaultColor.x, equipmentBunnyHood.defaultColor.y, equipmentBunnyHood.defaultColor.z, equipmentBunnyHood.defaultColor.w}; + Color_RGBA8 color = CVarGetColor(equipmentBunnyHood.cvar, defaultColor); + PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood1", equipmentBunnyHood.changedCvar, 5, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255)); + PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood2", equipmentBunnyHood.changedCvar, 6, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255)); + PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood3", equipmentBunnyHood.changedCvar, 83, gsDPSetPrimColor(0, 0, color.r, color.g, color.b, 255)); + PATCH_GFX(gGiBunnyHoodDL, "Equipment_BunnyHood4", equipmentBunnyHood.changedCvar, 84, gsDPSetEnvColor(color.r / 3, color.g / 3, color.b / 3, 255)); + PATCH_GFX(gLinkChildBunnyHoodDL, "Equipment_BunnyHood5", equipmentBunnyHood.changedCvar, 4, gsDPSetGrayscaleColor(color.r, color.g, color.b, 255)); + + if (manualChange) { + PATCH_GFX(gLinkChildBunnyHoodDL, "Equipment_BunnyHood6", equipmentBunnyHood.changedCvar, 13, gsSPGrayscale(true)); + if (CVarGetInteger(equipmentBunnyHood.changedCvar, 0)) { + ResourceMgr_PatchGfxByName(gLinkChildBunnyHoodDL, "Equipment_BunnyHood7", 125, gsSPBranchListOTRFilePath(gEndGrayscaleAndEndDlistDL)); + } else { + ResourceMgr_UnpatchGfxByName(gLinkChildBunnyHoodDL, "Equipment_BunnyHood7"); + } + } + } + static CosmeticOption& consumableGreenRupee = cosmeticOptions.at("Consumable_GreenRupee"); if (manualChange || CVarGetInteger(consumableGreenRupee.rainbowCvar, 0)) { static Color_RGBA8 defaultColor = {consumableGreenRupee.defaultColor.x, consumableGreenRupee.defaultColor.y, consumableGreenRupee.defaultColor.z, consumableGreenRupee.defaultColor.w}; @@ -1513,7 +1535,7 @@ void DrawSillyTab() { CVarClear("gCosmetics.BunnyHood_EarSpread"); LUS::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesOnNextTick(); } - UIWidgets::EnhancementSliderFloat("Goron Neck Length: %f", "##Goron_NeckLength", "gCosmetics.Goron_NeckLength", 0.0f, 1000.0f, "", 0.0f, false); + UIWidgets::EnhancementSliderFloat("Goron Neck Length: %f", "##Goron_NeckLength", "gCosmetics.Goron_NeckLength", 0.0f, 5000.0f, "", 0.0f, false); ImGui::SameLine(); if (ImGui::Button("Reset##Goron_NeckLength")) { CVarClear("gCosmetics.Goron_NeckLength"); 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/custom-message/CustomMessageTypes.h b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h index 4ce0db90a..916e1a7f8 100644 --- a/soh/soh/Enhancements/custom-message/CustomMessageTypes.h +++ b/soh/soh/Enhancements/custom-message/CustomMessageTypes.h @@ -3,8 +3,8 @@ typedef enum { TEXT_CURSED_SKULLTULA_PEOPLE = 0x22, TEXT_SARIAS_SONG_FACE_TO_FACE= 0x160, - TEXT_SARIAS_SONG_FOREST_SOUNDS = 0x161, - TEXT_SARIAS_SONG_FOREST_TEMPLE = 0x16A, + TEXT_SARIAS_SONG_TEXT_START = 0x160, + TEXT_SARIAS_SONG_TEXT_END = 0x16D, TEXT_SARIA_SFM = 0x10AD, TEXT_ITEM_KEY_SMALL = 0x60, TEXT_ITEM_DUNGEON_MAP = 0x66, diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp index c94d5f806..3e61505b2 100644 --- a/soh/soh/Enhancements/debugconsole.cpp +++ b/soh/soh/Enhancements/debugconsole.cpp @@ -1102,9 +1102,9 @@ static bool SpeedModifierHandler(std::shared_ptr Console, const st } const static std::map boots { - { "kokiri", PLAYER_BOOTS_KOKIRI }, - { "iron", PLAYER_BOOTS_IRON }, - { "hover", PLAYER_BOOTS_HOVER }, + { "kokiri", EQUIP_VALUE_BOOTS_KOKIRI }, + { "iron", EQUIP_VALUE_BOOTS_IRON }, + { "hover", EQUIP_VALUE_BOOTS_HOVER }, }; static bool BootsHandler(std::shared_ptr Console, const std::vector& args, std::string* output) { diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index 6636f5407..9af4eadb7 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -514,7 +514,7 @@ void DrawInfoTab() { } UIWidgets::InsertHelpHoverText("Z-Targeting behavior"); - if (gSaveContext.n64ddFlag && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT)) { + if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT)) { ImGui::InputScalar("Triforce Pieces", ImGuiDataType_U16, &gSaveContext.triforcePiecesCollected); UIWidgets::InsertHelpHoverText("Currently obtained Triforce Pieces. For Triforce Hunt."); } @@ -1602,17 +1602,17 @@ void DrawPlayerTab() { if (ImGui::Selectable("None")) { player->currentSwordItemId = ITEM_NONE; gSaveContext.equips.buttonItems[0] = ITEM_NONE; - Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_NONE); + Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_NONE); } if (ImGui::Selectable("Kokiri Sword")) { player->currentSwordItemId = ITEM_SWORD_KOKIRI; gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KOKIRI; - Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_KOKIRI); + Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_KOKIRI); } if (ImGui::Selectable("Master Sword")) { player->currentSwordItemId = ITEM_SWORD_MASTER; gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER; - Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_MASTER); + Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER); } if (ImGui::Selectable("Biggoron's Sword")) { if (gSaveContext.bgsFlag) { @@ -1629,12 +1629,12 @@ void DrawPlayerTab() { gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE; } - Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_BIGGORON); + Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_BIGGORON); } if (ImGui::Selectable("Fishing Pole")) { player->currentSwordItemId = ITEM_FISHING_POLE; gSaveContext.equips.buttonItems[0] = ITEM_FISHING_POLE; - Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_MASTER); + Inventory_ChangeEquipment(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_MASTER); } ImGui::EndCombo(); @@ -1642,19 +1642,19 @@ void DrawPlayerTab() { if (ImGui::BeginCombo("Shield", curShield)) { if (ImGui::Selectable("None")) { player->currentShield = PLAYER_SHIELD_NONE; - Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_NONE); + Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_NONE); } if (ImGui::Selectable("Deku Shield")) { player->currentShield = PLAYER_SHIELD_DEKU; - Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_DEKU); + Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_DEKU); } if (ImGui::Selectable("Hylian Shield")) { player->currentShield = PLAYER_SHIELD_HYLIAN; - Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_HYLIAN); + Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_HYLIAN); } if (ImGui::Selectable("Mirror Shield")) { player->currentShield = PLAYER_SHIELD_MIRROR; - Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_MIRROR); + Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_MIRROR); } ImGui::EndCombo(); } @@ -1662,15 +1662,15 @@ void DrawPlayerTab() { if (ImGui::BeginCombo("Tunic", curTunic)) { if (ImGui::Selectable("Kokiri Tunic")) { player->currentTunic = PLAYER_TUNIC_KOKIRI; - Inventory_ChangeEquipment(EQUIP_TUNIC, PLAYER_TUNIC_KOKIRI + 1); + Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_KOKIRI); } if (ImGui::Selectable("Goron Tunic")) { player->currentTunic = PLAYER_TUNIC_GORON; - Inventory_ChangeEquipment(EQUIP_TUNIC, PLAYER_TUNIC_GORON + 1); + Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_GORON); } if (ImGui::Selectable("Zora Tunic")) { player->currentTunic = PLAYER_TUNIC_ZORA; - Inventory_ChangeEquipment(EQUIP_TUNIC, PLAYER_TUNIC_ZORA + 1); + Inventory_ChangeEquipment(EQUIP_TYPE_TUNIC, EQUIP_VALUE_TUNIC_ZORA); } ImGui::EndCombo(); } @@ -1678,15 +1678,15 @@ void DrawPlayerTab() { if (ImGui::BeginCombo("Boots", curBoots)) { if (ImGui::Selectable("Kokiri Boots")) { player->currentBoots = PLAYER_BOOTS_KOKIRI; - Inventory_ChangeEquipment(EQUIP_BOOTS, PLAYER_BOOTS_KOKIRI + 1); + Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_KOKIRI); } if (ImGui::Selectable("Iron Boots")) { player->currentBoots = PLAYER_BOOTS_IRON; - Inventory_ChangeEquipment(EQUIP_BOOTS, PLAYER_BOOTS_IRON + 1); + Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_IRON); } if (ImGui::Selectable("Hover Boots")) { player->currentBoots = PLAYER_BOOTS_HOVER; - Inventory_ChangeEquipment(EQUIP_BOOTS, PLAYER_BOOTS_HOVER + 1); + Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, EQUIP_VALUE_BOOTS_HOVER); } ImGui::EndCombo(); } @@ -1694,6 +1694,10 @@ void DrawPlayerTab() { ImU16 one = 1; ImGui::PushItemWidth(ImGui::GetFontSize() * 6); DrawGroupWithBorder([&]() { + ImGui::Text("Current B Item"); + ImGui::InputScalar("B Button", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[0], &one, NULL); + ImGui::NewLine(); + ImGui::Text("Current C Equips"); ImGui::InputScalar("C Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[1], &one, NULL); ImGui::SameLine(); diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h index 3c3b66d73..42c9c91c0 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.h +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h @@ -500,6 +500,8 @@ const std::vector flagTables = { { RAND_INF_KAK_100_GOLD_SKULLTULA_REWARD, "KAK_100_GOLD_SKULLTULA_REWARD" }, { RAND_INF_GREG_FOUND, "RAND_INF_GREG_FOUND" }, + + { RAND_INF_TOT_MASTER_SWORD, "RAND_INF_TOT_MASTER_SWORD"}, { RAND_INF_CHILD_FISHING, "RAND_INF_CHILD_FISHING" }, { RAND_INF_ADULT_FISHING, "RAND_INF_ADULT_FISHING" }, { RAND_INF_10_BIG_POES, "RAND_INF_10_BIG_POES" }, diff --git a/soh/soh/Enhancements/enhancementTypes.h b/soh/soh/Enhancements/enhancementTypes.h index 7620d3fd8..529ebed81 100644 --- a/soh/soh/Enhancements/enhancementTypes.h +++ b/soh/soh/Enhancements/enhancementTypes.h @@ -68,3 +68,9 @@ typedef enum { BONK_DAMAGE_8_HEARTS, BONK_DAMAGE_OHKO, } BonkDamage; + +typedef enum { + DEKU_STICK_NORMAL, + DEKU_STICK_UNBREAKABLE, + DEKU_STICK_UNBREAKABLE_AND_ALWAYS_ON_FIRE, +} DekuStickType; diff --git a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp index 8a8120e70..206b26426 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp @@ -373,7 +373,7 @@ namespace GameInteractionEffect { GameInteractor::RawAction::ForceEquipBoots(parameters[0]); } void ForceEquipBoots::_Remove() { - GameInteractor::RawAction::ForceEquipBoots(PLAYER_BOOTS_KOKIRI); + GameInteractor::RawAction::ForceEquipBoots(EQUIP_VALUE_BOOTS_KOKIRI); } // MARK: - ModifyRunSpeedModifier @@ -425,9 +425,9 @@ namespace GameInteractionEffect { GameInteractionEffectQueryResult GiveOrTakeShield::CanBeApplied() { if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) { return GameInteractionEffectQueryResult::TemporarilyNotPossible; - } else if ((parameters[0] > 0 && ((gBitFlags[parameters[0] - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_SHIELD]) & + } else if ((parameters[0] > 0 && ((gBitFlags[parameters[0] - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_TYPE_SHIELD]) & gSaveContext.inventory.equipment)) || - (parameters[0] < 0 && !((gBitFlags[(parameters[0] * -1) - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_SHIELD]) & + (parameters[0] < 0 && !((gBitFlags[(parameters[0] * -1) - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_TYPE_SHIELD]) & gSaveContext.inventory.equipment))) { return GameInteractionEffectQueryResult::NotPossible; } else { diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h index 5b866793c..21b2a6b40 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h @@ -159,6 +159,7 @@ public: DEFINE_HOOK(OnSceneSpawnActors, void()); DEFINE_HOOK(OnPlayerUpdate, void()); DEFINE_HOOK(OnOcarinaSongAction, void()); + DEFINE_HOOK(OnShopSlotChange, void(uint8_t cursorIndex, int16_t price)); DEFINE_HOOK(OnActorInit, void(void* actor)); DEFINE_HOOK(OnActorUpdate, void(void* actor)); DEFINE_HOOK(OnActorKill, void(void* actor)); @@ -231,6 +232,7 @@ public: static void EmulateRandomButtonPress(uint32_t chancePercentage = 100); static void SetRandomWind(bool active); static void SetPlayerInvincibility(bool active); + static void ClearCutscenePointer(); static GameInteractionEffectQueryResult SpawnEnemyWithOffset(uint32_t enemyId, int32_t enemyParams); static GameInteractionEffectQueryResult SpawnActor(uint32_t actorId, int32_t actorParams); diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp index d65ee300b..27a679a65 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp @@ -58,6 +58,10 @@ void GameInteractor_ExecuteOnOcarinaSongAction() { GameInteractor::Instance->ExecuteHooks(); } +void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t price) { + GameInteractor::Instance->ExecuteHooks(cursorIndex, price); +} + void GameInteractor_ExecuteOnActorInit(void* actor) { GameInteractor::Instance->ExecuteHooks(actor); } diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h index 11589cab6..4d7f8bbdf 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h @@ -24,6 +24,7 @@ void GameInteractor_ExecuteOnActorKill(void* actor); void GameInteractor_ExecuteOnEnemyDefeat(void* actor); void GameInteractor_ExecuteOnPlayerBonk(); void GameInteractor_ExecuteOnOcarinaSongAction(); +void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t price); void GameInteractor_ExecuteOnPlayDestroy(); void GameInteractor_ExecuteOnPlayDrawEnd(); diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp index 864eef427..54a3b8e7b 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp @@ -97,8 +97,8 @@ void GameInteractor::RawAction::SetWeatherStorm(bool active) { void GameInteractor::RawAction::ForceEquipBoots(int8_t boots) { Player* player = GET_PLAYER(gPlayState); - player->currentBoots = boots; - Inventory_ChangeEquipment(EQUIP_BOOTS, boots + 1); + player->currentBoots = BOOTS_EQUIP_TO_PLAYER(boots); + Inventory_ChangeEquipment(EQUIP_TYPE_BOOTS, boots); Player_SetBootData(gPlayState, player); } @@ -274,24 +274,24 @@ void GameInteractor::RawAction::GiveOrTakeShield(int32_t shield) { break; } - gSaveContext.inventory.equipment &= ~(gBitFlags[shield - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_SHIELD]); + gSaveContext.inventory.equipment &= ~(gBitFlags[shield - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_TYPE_SHIELD]); if (player->currentShield == shieldToCheck) { player->currentShield = PLAYER_SHIELD_NONE; - Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_NONE); + Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_NONE); } } else { Item_Give(gPlayState, shield); if (player->currentShield == PLAYER_SHIELD_NONE) { if (LINK_IS_CHILD && shield == ITEM_SHIELD_DEKU) { player->currentShield = PLAYER_SHIELD_DEKU; - Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_DEKU); + Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_DEKU); } else if (LINK_IS_ADULT && shield == ITEM_SHIELD_MIRROR) { player->currentShield = PLAYER_SHIELD_MIRROR; - Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_MIRROR); + Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_MIRROR); } else if (shield == ITEM_SHIELD_HYLIAN) { player->currentShield = PLAYER_SHIELD_HYLIAN; - Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_HYLIAN); + Inventory_ChangeEquipment(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_HYLIAN); } } } @@ -542,6 +542,13 @@ void GameInteractor::RawAction::SetPlayerInvincibility(bool active) { } } +/// Clears the cutscene pointer to a value safe for wrong warps. +void GameInteractor::RawAction::ClearCutscenePointer() { + if (!gPlayState) return; + static uint32_t null_cs[] = {0, 0}; + gPlayState->csCtx.segment = &null_cs; +} + GameInteractionEffectQueryResult GameInteractor::RawAction::SpawnEnemyWithOffset(uint32_t enemyId, int32_t enemyParams) { if (!GameInteractor::CanSpawnActor()) { diff --git a/soh/soh/Enhancements/gameplaystats.cpp b/soh/soh/Enhancements/gameplaystats.cpp index ea95afe8e..a6e5a47e8 100644 --- a/soh/soh/Enhancements/gameplaystats.cpp +++ b/soh/soh/Enhancements/gameplaystats.cpp @@ -7,6 +7,7 @@ extern "C" { #include "functions.h" #include "macros.h" #include "../UIWidgets.hpp" +#include "soh/util.h" #include #include @@ -286,10 +287,8 @@ extern "C" char* GameplayStats_GetCurrentTime() { } void LoadStatsVersion1() { - std::string buildVersion; - SaveManager::Instance->LoadData("buildVersion", buildVersion); - strncpy(gSaveContext.sohStats.buildVersion, buildVersion.c_str(), ARRAY_COUNT(gSaveContext.sohStats.buildVersion) - 1); - gSaveContext.sohStats.buildVersion[ARRAY_COUNT(gSaveContext.sohStats.buildVersion) - 1] = 0; + SaveManager::Instance->LoadCharArray("buildVersion", gSaveContext.sohStats.buildVersion, + ARRAY_COUNT(gSaveContext.sohStats.buildVersion)); SaveManager::Instance->LoadData("buildVersionMajor", gSaveContext.sohStats.buildVersionMajor); SaveManager::Instance->LoadData("buildVersionMinor", gSaveContext.sohStats.buildVersionMinor); SaveManager::Instance->LoadData("buildVersionPatch", gSaveContext.sohStats.buildVersionPatch); @@ -334,9 +333,6 @@ void LoadStatsVersion1() { SaveManager::Instance->LoadArray("entrancesDiscovered", ARRAY_COUNT(gSaveContext.sohStats.entrancesDiscovered), [](size_t i) { SaveManager::Instance->LoadData("", gSaveContext.sohStats.entrancesDiscovered[i]); }); - SaveManager::Instance->LoadArray("locationsSkipped", ARRAY_COUNT(gSaveContext.sohStats.locationsSkipped), [](size_t i) { - SaveManager::Instance->LoadData("", gSaveContext.sohStats.locationsSkipped[i]); - }); } void SaveStats(SaveContext* saveContext, int sectionID, bool fullSave) { @@ -378,9 +374,6 @@ void SaveStats(SaveContext* saveContext, int sectionID, bool fullSave) { SaveManager::Instance->SaveArray("entrancesDiscovered", ARRAY_COUNT(saveContext->sohStats.entrancesDiscovered), [&](size_t i) { SaveManager::Instance->SaveData("", saveContext->sohStats.entrancesDiscovered[i]); }); - SaveManager::Instance->SaveArray("locationsSkipped", ARRAY_COUNT(saveContext->sohStats.locationsSkipped), [&](size_t i) { - SaveManager::Instance->SaveData("", saveContext->sohStats.locationsSkipped[i]); - }); } void GameplayStatsRow(const char* label, const std::string& value, ImVec4 color = COLOR_WHITE) { @@ -688,12 +681,9 @@ void InitStats(bool isDebug) { for (int entrancesIdx = 0; entrancesIdx < ARRAY_COUNT(gSaveContext.sohStats.entrancesDiscovered); entrancesIdx++) { gSaveContext.sohStats.entrancesDiscovered[entrancesIdx] = 0; } - for (int rc = 0; rc < ARRAY_COUNT(gSaveContext.sohStats.locationsSkipped); rc++) { - gSaveContext.sohStats.locationsSkipped[rc] = 0; - } - strncpy(gSaveContext.sohStats.buildVersion, (const char*) gBuildVersion, sizeof(gSaveContext.sohStats.buildVersion) - 1); - gSaveContext.sohStats.buildVersion[sizeof(gSaveContext.sohStats.buildVersion) - 1] = 0; + SohUtils::CopyStringToCharArray(gSaveContext.sohStats.buildVersion, std::string((char*)gBuildVersion), + ARRAY_COUNT(gSaveContext.sohStats.buildVersion)); gSaveContext.sohStats.buildVersionMajor = gBuildVersionMajor; gSaveContext.sohStats.buildVersionMinor = gBuildVersionMinor; gSaveContext.sohStats.buildVersionPatch = gBuildVersionPatch; diff --git a/soh/soh/Enhancements/mods.cpp b/soh/soh/Enhancements/mods.cpp index 3e539360e..32185eefb 100644 --- a/soh/soh/Enhancements/mods.cpp +++ b/soh/soh/Enhancements/mods.cpp @@ -44,8 +44,8 @@ bool performSave = false; void ReloadSceneTogglingLinkAge() { gPlayState->nextEntranceIndex = gSaveContext.entranceIndex; gPlayState->sceneLoadFlag = 0x14; - gPlayState->fadeTransition = 11; - gSaveContext.nextTransitionType = 11; + gPlayState->fadeTransition = 42; // Fade Out + gSaveContext.nextTransitionType = 42; gPlayState->linkAgeOnLoad ^= 1; // toggle linkAgeOnLoad } @@ -149,6 +149,19 @@ void RegisterInfiniteISG() { }); } +//Permanent quick put away (QPA) glitched damage value +void RegisterEzQPA() { + GameInteractor::Instance->RegisterGameHook([]() { + if (!gPlayState) return; + + if (CVarGetInteger("gEzQPA", 0) != 0) { + Player* player = GET_PLAYER(gPlayState); + player->meleeWeaponQuads[0].info.toucher.dmgFlags = 0x16171617; + player->meleeWeaponQuads[1].info.toucher.dmgFlags = 0x16171617; + } + }); +} + void RegisterUnrestrictedItems() { GameInteractor::Instance->RegisterGameHook([]() { if (!gPlayState) return; @@ -225,7 +238,7 @@ void RegisterOcarinaTimeTravel() { Actor* nearbyOcarinaSpot = Actor_FindNearby(gPlayState, player, ACTOR_EN_OKARINA_TAG, ACTORCAT_PROP, 120.0f); Actor* nearbyDoorOfTime = Actor_FindNearby(gPlayState, player, ACTOR_DOOR_TOKI, ACTORCAT_BG, 500.0f); Actor* nearbyFrogs = Actor_FindNearby(gPlayState, player, ACTOR_EN_FR, ACTORCAT_NPC, 300.0f); - uint8_t hasMasterSword = (gBitFlags[ITEM_SWORD_MASTER - ITEM_SWORD_KOKIRI] << gEquipShifts[EQUIP_SWORD]) & gSaveContext.inventory.equipment; + uint8_t hasMasterSword = CHECK_OWNED_EQUIP(EQUIP_TYPE_SWORD, EQUIP_INV_SWORD_MASTER); uint8_t hasOcarinaOfTime = (INV_CONTENT(ITEM_OCARINA_TIME) == ITEM_OCARINA_TIME); // If TimeTravel + Player have the Ocarina of Time + Have Master Sword + is in proper range // TODO: Once Swordless Adult is fixed: Remove the Master Sword check @@ -250,6 +263,8 @@ void AutoSave(GetItemEntry itemEntry) { // 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)) { @@ -313,8 +328,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)) { + 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) { @@ -355,7 +371,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); } @@ -373,11 +390,18 @@ void RegisterShadowTag() { if (!CVarGetInteger("gShadowTag", 0)) { return; } - if (shouldSpawn && (delayTimer <= 0)) { - Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_WALLMAS, 0, 0, 0, 0, 0, 0, 3, false); - shouldSpawn = false; + if (gPlayState->sceneNum == SCENE_FOREST_TEMPLE && // Forest Temple Scene + gPlayState->roomCtx.curRoom.num == 16 || // Green Poe Room + gPlayState->roomCtx.curRoom.num == 13 || // Blue Poe Room + gPlayState->roomCtx.curRoom.num == 12) { // Red Poe Room + return; } else { - delayTimer--; + if (shouldSpawn && (delayTimer <= 0)) { + Actor_Spawn(&gPlayState->actorCtx, gPlayState, ACTOR_EN_WALLMAS, 0, 0, 0, 0, 0, 0, 3, false); + shouldSpawn = false; + } else { + delayTimer--; + } } }); GameInteractor::Instance->RegisterGameHook([]() { @@ -1000,7 +1024,7 @@ void RegisterRandomizerSheikSpawn() { if (!gPlayState) return; bool canSheik = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIAL_COUNT) != RO_GANONS_TRIALS_SKIP && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LIGHT_ARROWS_HINT)); - if (!gSaveContext.n64ddFlag || !LINK_IS_ADULT || !canSheik) return; + if (!IS_RANDO || !LINK_IS_ADULT || !canSheik) return; switch (gPlayState->sceneNum) { case SCENE_TEMPLE_OF_TIME: if (gPlayState->roomCtx.curRoom.num == 1) { @@ -1017,6 +1041,39 @@ void RegisterRandomizerSheikSpawn() { }); } +void RegisterRandomizedEnemySizes() { + GameInteractor::Instance->RegisterGameHook([](void* refActor) { + // Randomized Enemy Sizes + Player* player = GET_PLAYER(gPlayState); + Actor* actor = static_cast(refActor); + + // Only apply to enemies and bosses. Exclude the wobbly platforms in Jabu because they need to act like platforms. + if (!CVarGetInteger("gRandomizedEnemySizes", 0) || (actor->category != ACTORCAT_ENEMY && actor->category != ACTORCAT_BOSS) || actor->id == ACTOR_EN_BROB) { + return; + } + + float randomNumber; + float randomScale; + + uint8_t bigActor = rand() % 2; + + // Big actor. Dodongo and Volvagia are always smaller because they're impossible when bigger. + if (bigActor && actor->id != ACTOR_BOSS_DODONGO && actor->id != ACTOR_BOSS_FD && + actor->id != ACTOR_BOSS_FD2) { + 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 RegisterPauseWarp() { GameInteractor::Instance->RegisterGameHook([]() { PauseWarp_Main(); @@ -1036,6 +1093,7 @@ void InitMods() { RegisterInfiniteNayrusLove(); RegisterMoonJumpOnL(); RegisterInfiniteISG(); + RegisterEzQPA(); RegisterUnrestrictedItems(); RegisterFreezeTime(); RegisterSwitchAge(); @@ -1053,6 +1111,7 @@ void InitMods() { RegisterEnemyDefeatCounts(); RegisterAltTrapTypes(); RegisterRandomizerSheikSpawn(); + RegisterRandomizedEnemySizes(); NameTag_RegisterHooks(); RegisterPauseWarp(); } diff --git a/soh/soh/Enhancements/presets.h b/soh/soh/Enhancements/presets.h index a4a1a9d1a..f0f586e00 100644 --- a/soh/soh/Enhancements/presets.h +++ b/soh/soh/Enhancements/presets.h @@ -74,6 +74,7 @@ const std::vector enhancementsCvars = { "gNoForcedNavi", "gSkulltulaFreeze", "gMMBunnyHood", + "gAdultBunnyHood", "gFastChests", "gChestSizeAndTextureMatchesContents", "gFastDrops", @@ -166,6 +167,7 @@ const std::vector enhancementsCvars = { "gBombchusOOB", "gQuickPutaway", "gGsCutscene", + "gRestoreRBAValues", "gSkipSaveConfirmation", "gAutosave", "gDisableCritWiggle", @@ -214,6 +216,7 @@ const std::vector enhancementsCvars = { "gBowReticle", "gFixTexturesOOB", "gIvanCoopModeEnabled", + "gEnemySpawnsOverWaterboxes", }; const std::vector cheatCvars = { @@ -244,6 +247,7 @@ const std::vector cheatCvars = { "gMoonJumpOnL", "gSuperTunic", "gEzISG", + "gEzQPA", "gTimelessEquipment", "gCheatEasyPauseBufferEnabled", "gCheatEasyInputBufferingEnabled", @@ -520,6 +524,8 @@ const std::vector enhancedPresetEntries = { PRESET_ENTRY_S32("gNaviTextFix", 1), // Extend Silver Rupee Jingle PRESET_ENTRY_S32("gSilverRupeeJingleExtend", 1), + // Fix enemies not spawning on ground over water + PRESET_ENTRY_S32("gEnemySpawnsOverWaterboxes", 1), // Red Ganon blood PRESET_ENTRY_S32("gRedGanonBlood", 1), @@ -545,6 +551,8 @@ const std::vector enhancedPresetEntries = { PRESET_ENTRY_S32("gSkulltulaFreeze", 1), // MM Bunny Hood PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST_AND_JUMP), + // Adult Bunny Hood + PRESET_ENTRY_S32("gAdultBunnyHood", 1), // Fast Chests PRESET_ENTRY_S32("gFastChests", 1), // Fast Drops @@ -665,6 +673,8 @@ const std::vector randomizerPresetEntries = { PRESET_ENTRY_S32("gSkulltulaFreeze", 1), // MM Bunny Hood PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST_AND_JUMP), + // Adult Bunny Hood + PRESET_ENTRY_S32("gAdultBunnyHood", 1), // Fast Chests PRESET_ENTRY_S32("gFastChests", 1), // Fast Drops @@ -763,7 +773,8 @@ const std::vector spockRacePresetEntries = { PRESET_ENTRY_S32("gInstantPutaway", 1), PRESET_ENTRY_S32("gFastBoomerang", 1), PRESET_ENTRY_S32("gDpadNoDropOcarinaInput", 1), - PRESET_ENTRY_S32("gMMBunnyHood", 2), + PRESET_ENTRY_S32("gAdultBunnyHood", 1), + PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST), PRESET_ENTRY_S32("gSeparateArrows", 1), PRESET_ENTRY_S32("gAssignableTunicsAndBoots", 1), PRESET_ENTRY_S32("gEquipmentCanBeRemoved", 1), @@ -803,38 +814,39 @@ const std::vector spockRacePresetEntries = { PRESET_ENTRY_S32("gRandomizeCompleteMaskQuest", 1), PRESET_ENTRY_S32("gRandomizeCuccosToReturn", 1), PRESET_ENTRY_S32("gRandomizeDampeHint", 1), - PRESET_ENTRY_S32("gRandomizeDoorOfTime", 2), + PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN), PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1), - PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"), - PRESET_ENTRY_S32("gRandomizeForest", 2), + PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,143,144,229,"), + PRESET_ENTRY_S32("gRandomizeForest", RO_FOREST_OPEN), PRESET_ENTRY_S32("gRandomizeFullWallets", 1), - PRESET_ENTRY_S32("gRandomizeGanonTrial", 0), - PRESET_ENTRY_S32("gRandomizeGerudoFortress", 1), + PRESET_ENTRY_S32("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP), + PRESET_ENTRY_S32("gRandomizeGerudoFortress", RO_GF_FAST), PRESET_ENTRY_S32("gRandomizeGregHint", 1), PRESET_ENTRY_S32("gRandomizeGsExpectSunsSong", 1), - PRESET_ENTRY_S32("gRandomizeKakarikoGate", 1), + PRESET_ENTRY_S32("gRandomizeKakarikoGate", RO_KAK_GATE_OPEN), PRESET_ENTRY_S32("gRandomizeLacsRewardCount", 5), - PRESET_ENTRY_S32("gRandomizeRainbowBridge", 7), + PRESET_ENTRY_S32("gRandomizeRainbowBridge", RO_BRIDGE_GREG), PRESET_ENTRY_S32("gRandomizeScrubText", 1), - PRESET_ENTRY_S32("gRandomizeShopsanity", 6), - PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", 9), - PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", 2), + PRESET_ENTRY_S32("gRandomizeShopsanity", RO_SHOPSANITY_RANDOM), + PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_LACS_REWARDS), + PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", RO_KEYRINGS_COUNT), PRESET_ENTRY_S32("gRandomizeShuffleKokiriSword", 1), PRESET_ENTRY_S32("gRandomizeShuffleOcarinas", 1), - PRESET_ENTRY_S32("gRandomizeShuffleScrubs", 1), + PRESET_ENTRY_S32("gRandomizeShuffleScrubs", RO_SCRUBS_AFFORDABLE), PRESET_ENTRY_S32("gRandomizeSkipChildStealth", 1), PRESET_ENTRY_S32("gRandomizeSkipChildZelda", 1), PRESET_ENTRY_S32("gRandomizeSkipEponaRace", 1), PRESET_ENTRY_S32("gRandomizeSkipScarecrowsSong", 1), PRESET_ENTRY_S32("gRandomizeSkipTowerEscape", 1), PRESET_ENTRY_S32("gRandomizeStartingConsumables", 1), - PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", 0), + PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", RO_DUNGEON_ITEM_LOC_STARTWITH), PRESET_ENTRY_S32("gRandomizeStartingOcarina", 1), PRESET_ENTRY_S32("gRandomizeSunlightArrows", 1), PRESET_ENTRY_S32("gRandomizerSettingsEnabled", 1), }; const std::vector spockRaceNoLogicPresetEntries = { + PRESET_ENTRY_S32("gAdultBunnyHood", 1), PRESET_ENTRY_S32("gAdultMinimumWeightFish", 6), PRESET_ENTRY_S32("gAssignableTunicsAndBoots", 1), PRESET_ENTRY_S32("gCheatEasyPauseBufferEnabled", 1), @@ -871,7 +883,7 @@ const std::vector spockRaceNoLogicPresetEntries = { PRESET_ENTRY_S32("gInjectItemCounts", 1), PRESET_ENTRY_S32("gInstantFishing", 1), PRESET_ENTRY_S32("gInstantPutaway", 1), - PRESET_ENTRY_S32("gMMBunnyHood", 2), + PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST), PRESET_ENTRY_S32("gMarketSneak", 1), PRESET_ENTRY_S32("gMaskSelect", 1), PRESET_ENTRY_S32("gMweepSpeed", 5), @@ -881,7 +893,6 @@ const std::vector spockRaceNoLogicPresetEntries = { PRESET_ENTRY_S32("gOnFileSelectNameEntry", 0), PRESET_ENTRY_S32("gOpenMenuBar", 1), PRESET_ENTRY_S32("gPauseAnyCursor", 1), - PRESET_ENTRY_S32("gPreset1", 1), PRESET_ENTRY_S32("gRStickOcarina", 1), PRESET_ENTRY_S32("gRandomize10GSHint", 1), PRESET_ENTRY_S32("gRandomize20GSHint", 1), @@ -891,44 +902,44 @@ const std::vector spockRaceNoLogicPresetEntries = { PRESET_ENTRY_S32("gRandomizeAllLocationsReachable", 0), PRESET_ENTRY_S32("gRandomizeBlueFireArrows", 1), PRESET_ENTRY_S32("gRandomizeBombchusInLogic", 1), - PRESET_ENTRY_S32("gRandomizeBossKeysanity", 5), + PRESET_ENTRY_S32("gRandomizeBossKeysanity", RO_DUNGEON_ITEM_LOC_ANYWHERE), PRESET_ENTRY_S32("gRandomizeCompleteMaskQuest", 1), PRESET_ENTRY_S32("gRandomizeCuccosToReturn", 1), PRESET_ENTRY_S32("gRandomizeDampeHint", 1), - PRESET_ENTRY_S32("gRandomizeDoorOfTime", 2), + PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN), PRESET_ENTRY_S32("gRandomizeEnableBombchuDrops", 1), - PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,142,143,228,"), - PRESET_ENTRY_S32("gRandomizeForest", 2), + PRESET_ENTRY_STRING("gRandomizeExcludedLocations", "78,143,144,229,"), + PRESET_ENTRY_S32("gRandomizeForest", RO_FOREST_OPEN), PRESET_ENTRY_S32("gRandomizeFullWallets", 1), - PRESET_ENTRY_S32("gRandomizeGanonTrial", 0), - PRESET_ENTRY_S32("gRandomizeGerudoFortress", 1), - PRESET_ENTRY_S32("gRandomizeGerudoKeys", 3), + PRESET_ENTRY_S32("gRandomizeGanonTrial", RO_GANONS_TRIALS_SKIP), + PRESET_ENTRY_S32("gRandomizeGerudoFortress", RO_GF_FAST), + PRESET_ENTRY_S32("gRandomizeGerudoKeys", RO_GERUDO_KEYS_ANYWHERE), PRESET_ENTRY_S32("gRandomizeGregHint", 1), PRESET_ENTRY_S32("gRandomizeGsExpectSunsSong", 0), - PRESET_ENTRY_S32("gRandomizeKakarikoGate", 1), - PRESET_ENTRY_S32("gRandomizeKeysanity", 5), + PRESET_ENTRY_S32("gRandomizeKakarikoGate", RO_KAK_GATE_OPEN), + PRESET_ENTRY_S32("gRandomizeKeysanity", RO_DUNGEON_ITEM_LOC_ANYWHERE), PRESET_ENTRY_S32("gRandomizeLacsRewardCount", 5), - PRESET_ENTRY_S32("gRandomizeLogicRules", 1), - PRESET_ENTRY_S32("gRandomizeRainbowBridge", 7), + PRESET_ENTRY_S32("gRandomizeLogicRules", RO_LOGIC_NO_LOGIC), + PRESET_ENTRY_S32("gRandomizeRainbowBridge", RO_BRIDGE_GREG), PRESET_ENTRY_S32("gRandomizeScrubText", 1), - PRESET_ENTRY_S32("gRandomizeShopsanity", 6), + PRESET_ENTRY_S32("gRandomizeShopsanity", RO_SHOPSANITY_RANDOM), PRESET_ENTRY_S32("gRandomizeShuffleAdultTrade", 0), PRESET_ENTRY_S32("gRandomizeShuffleBeans", 1), - PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", 9), + PRESET_ENTRY_S32("gRandomizeShuffleGanonBossKey", RO_GANON_BOSS_KEY_LACS_REWARDS), PRESET_ENTRY_S32("gRandomizeShuffleGerudoToken", 1), - PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", 2), + PRESET_ENTRY_S32("gRandomizeShuffleKeyRings", RO_KEYRINGS_COUNT), PRESET_ENTRY_S32("gRandomizeShuffleKokiriSword", 1), PRESET_ENTRY_S32("gRandomizeShuffleOcarinas", 1), PRESET_ENTRY_S32("gRandomizeShuffleScrubs", 1), - PRESET_ENTRY_S32("gRandomizeShuffleSongs", 2), - PRESET_ENTRY_S32("gRandomizeShuffleTokens", 3), + PRESET_ENTRY_S32("gRandomizeShuffleSongs", RO_SONG_SHUFFLE_ANYWHERE), + PRESET_ENTRY_S32("gRandomizeShuffleTokens", RO_TOKENSANITY_ALL), PRESET_ENTRY_S32("gRandomizeSkipChildStealth", 1), PRESET_ENTRY_S32("gRandomizeSkipChildZelda", 1), PRESET_ENTRY_S32("gRandomizeSkipEponaRace", 1), PRESET_ENTRY_S32("gRandomizeSkipScarecrowsSong", 1), PRESET_ENTRY_S32("gRandomizeSkipTowerEscape", 1), PRESET_ENTRY_S32("gRandomizeStartingConsumables", 1), - PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", 0), + PRESET_ENTRY_S32("gRandomizeStartingMapsCompasses", RO_DUNGEON_ITEM_LOC_STARTWITH), PRESET_ENTRY_S32("gRandomizeStartingOcarina", 1), PRESET_ENTRY_S32("gRandomizeSunlightArrows", 1), PRESET_ENTRY_S32("gRandomizerSettingsEnabled", 1), @@ -946,6 +957,7 @@ const std::vector s6PresetEntries = { PRESET_ENTRY_S32("gChestSizeAndTextureMatchesContents", CSMC_BOTH), PRESET_ENTRY_S32("gFastChests", 1), PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST), + PRESET_ENTRY_S32("gAdultBunnyHood", 1), PRESET_ENTRY_S32("gRandomizeBigPoeTargetCount", 1), PRESET_ENTRY_S32("gRandomizeCuccosToReturn", 4), PRESET_ENTRY_S32("gRandomizeDoorOfTime", RO_DOOROFTIME_OPEN), @@ -979,6 +991,7 @@ const std::vector hellModePresetEntries = { PRESET_ENTRY_S32("gChestSizeAndTextureMatchesContents", CSMC_BOTH), PRESET_ENTRY_S32("gFastChests", 1), PRESET_ENTRY_S32("gMMBunnyHood", BUNNY_HOOD_FAST), + PRESET_ENTRY_S32("gAdultBunnyHood", 1), PRESET_ENTRY_S32("gRandomizeBigPoeTargetCount", 1), PRESET_ENTRY_S32("gRandomizeBlueFireArrows", 1), PRESET_ENTRY_S32("gRandomizeBossKeysanity", RO_DUNGEON_ITEM_LOC_ANYWHERE), @@ -1010,6 +1023,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 index bd308596e..5df67bb87 100644 --- a/soh/soh/Enhancements/randomizer/3drando/entrance.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/entrance.cpp @@ -1232,6 +1232,11 @@ int ShuffleAllEntrances() { } } + // Validate the world one last time to ensure all special conditions are still valid + if (!ValidateWorld(nullptr)) { + return ENTRANCE_SHUFFLE_FAILURE; + } + return ENTRANCE_SHUFFLE_SUCCESS; } diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp index 358ae285d..a50de6502 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp @@ -28,12 +28,12 @@ void HintTable_Init() { hintTable[PREFIX] = HintText::Exclude({ Text{ "They say that ", /*french*/ "Selon moi, ", /*spanish*/ "Según dicen, " } }); hintTable[WAY_OF_THE_HERO] = - HintText::Exclude({ Text{ " is on the way of the hero.", /*french*/ " est sur la voie du héros.", + HintText::Exclude({ Text{ " is on %cthe way of the hero%w.", /*french*/ " est sur %cla voie du héros%w.", /*spanish*/ " conduce a la senda del héroe." } }); hintTable[PLUNDERING] = HintText::Exclude({ Text{ "plundering ", /*french*/ "explorer ", /*spanish*/ "inspeccionar " } }); hintTable[FOOLISH] = HintText::Exclude( - { Text{ " is a foolish choice.", /*french*/ " est futile.", /*spanish*/ " no es una sabia decisión." } }); + { Text{ " is %pa foolish choice%w.", /*french*/ " est %pfutile%w.", /*spanish*/ " no es una sabia decisión." } }); hintTable[CAN_BE_FOUND_AT] = HintText::Exclude({ Text{ "can be found at", /*french*/ "se trouve dans", /*spanish*/ "aguarda en" } }); hintTable[HOARDS] = HintText::Exclude({ Text{ "hoards", /*french*/ "recèle", /*spanish*/ "acapara" } }); @@ -1046,6 +1046,11 @@ void HintTable_Init() { Text{ "Temple of Time", /*french*/ "le Temple du Temps", /*spanish*/ "el Templo del Tiempo" }, }); + hintTable[CASTLE_GROUNDS] = HintText::Exclude({ + // obscure text + Text{ "the Castle Grounds", /*french*/ "le Château d'Hyrule", /*spanish*/ "" }, + }); + hintTable[HYRULE_CASTLE] = HintText::Exclude({ // obscure text Text{ "Hyrule Castle", /*french*/ "le Château d'Hyrule", /*spanish*/ "el Castillo de Hyrule" }, @@ -2958,6 +2963,20 @@ void HintTable_Init() { "Ja, ja, ja... Nunca me derrotarás reflejando mis esferas de energía y desplegando la flecha de luz de " }, }); + + /*-------------------------- + |MASTER SWORD LOCATION TEXT| + ---------------------------*/ + + hintTable[MASTER_SWORD_LOCATION_HINT] = HintText::MasterSword({ + // obscure text + Text{"And even if you do, you'll never find the legendary blade hidden in ", + /*french*/ + "Et même si tu les trouves, tu ne touveras jamais l'épée de légende cachée dans ", + /*spanish*/ + "E incluso si lo haces, nunca encontrarás la espada legendaria escondida en " }, + }); + hintTable[YOUR_POCKET] = HintText::Exclude({ // obscure text Text{ "your pocket", /*french*/ "tes poches", /*spanish*/ "tu bolsillo" }, diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp index 8b9f37f9e..f2e110226 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp @@ -131,6 +131,10 @@ void HintTable_Init_Exclude_Overworld() { Text{"a #hole in a volcano# holds", /*french*/"la #grotte dans le volcan# contient", /*spanish*/"bajo el #hoyo de un volcán# yace"}, }); + hintTable[TOT_MASTER_SWORD] = HintText::Exclude({ + //obscure text + Text{"a #pedestal in a temple# holds", /*french*/"un #piédestal dans un temple# contient", /*spanish*/"un #pedestal en un templo# sostiene"}, + }); hintTable[TOT_LIGHT_ARROWS_CUTSCENE] = HintText::Exclude({ //obscure text diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp index c1610ce07..19fdadc7e 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp @@ -6,6 +6,7 @@ #include "item_pool.hpp" #include "logic.hpp" #include "random.hpp" +#include "settings.hpp" #include "spoiler_log.hpp" #include "fill.hpp" #include "hint_list.hpp" @@ -143,7 +144,9 @@ Text warpRequiemText; Text warpNocturneText; Text warpPreludeText; + std::string lightArrowHintLoc; +std::string masterSwordHintLoc; std::string sariaHintLoc; std::string dampeHintLoc; @@ -203,6 +206,10 @@ Text& GetWarpPreludeText() { return warpPreludeText; } +std::string GetMasterSwordHintLoc() { + return masterSwordHintLoc; +} + std::string GetLightArrowHintLoc() { return lightArrowHintLoc; } @@ -314,7 +321,7 @@ static void CreateLocationHint(const std::vector& possibleHintLocation Text itemHintText = Location(hintedLocation)->GetPlacedItem().GetHint().GetText(); Text prefix = Hint(PREFIX).GetText(); - Text finalHint = prefix + locationHintText + " #"+itemHintText+"#."; + Text finalHint = prefix + "%r" + locationHintText + " #%g" + itemHintText + "#%w."; SPDLOG_DEBUG("\tMessage: "); SPDLOG_DEBUG(finalHint.english); SPDLOG_DEBUG("\n\n"); @@ -367,7 +374,7 @@ static void CreateWothHint(uint8_t* remainingDungeonWothHints) { // form hint text Text locationText = GetHintRegion(Location(hintedLocation)->GetParentRegionKey())->GetHint().GetText(); - Text finalWothHint = Hint(PREFIX).GetText() + "#" + locationText + "#" + Hint(WAY_OF_THE_HERO).GetText(); + Text finalWothHint = Hint(PREFIX).GetText() + "%r#" + locationText + "#%w" + Hint(WAY_OF_THE_HERO).GetText(); SPDLOG_DEBUG("\tMessage: "); SPDLOG_DEBUG(finalWothHint.english); SPDLOG_DEBUG("\n\n"); @@ -411,7 +418,7 @@ static void CreateBarrenHint(uint8_t* remainingDungeonBarrenHints, std::vectorGetParentRegionKey())->GetHint().GetText(); Text finalBarrenHint = - Hint(PREFIX).GetText() + Hint(PLUNDERING).GetText() + "#" + locationText + "#" + Hint(FOOLISH).GetText(); + Hint(PREFIX).GetText() + Hint(PLUNDERING).GetText() + "%r#" + locationText + "#%w" + Hint(FOOLISH).GetText(); SPDLOG_DEBUG("\tMessage: "); SPDLOG_DEBUG(finalBarrenHint.english); SPDLOG_DEBUG("\n\n"); @@ -457,13 +464,13 @@ static void CreateRandomLocationHint(const bool goodItem = false) { Text locationText = GetHintRegion(Location(hintedLocation)->GetParentRegionKey())->GetHint().GetText(); // RANDOTODO: reconsider dungeon vs non-dungeon item location hints when boss shuffle mixed pools happens if (Location(hintedLocation)->IsDungeon()) { - Text finalHint = Hint(PREFIX).GetText()+"#"+locationText+"# "+Hint(HOARDS).GetText()+" #"+itemText+"#."; + Text finalHint = Hint(PREFIX).GetText()+"%r#"+locationText+"#%w "+Hint(HOARDS).GetText()+" %g#"+itemText+"#%w."; SPDLOG_DEBUG("\tMessage: "); SPDLOG_DEBUG(finalHint.english); SPDLOG_DEBUG("\n\n"); AddHint(finalHint, gossipStone, {QM_GREEN, QM_RED}, HINT_TYPE_NAMED_ITEM, hintedLocation); } else { - Text finalHint = Hint(PREFIX).GetText()+"#"+itemText+"# "+Hint(CAN_BE_FOUND_AT).GetText()+" #"+locationText+"#."; + Text finalHint = Hint(PREFIX).GetText()+"%r#"+itemText+"#%w "+Hint(CAN_BE_FOUND_AT).GetText()+" %g#"+locationText+"#%w."; SPDLOG_DEBUG("\tMessage: "); SPDLOG_DEBUG(finalHint.english); SPDLOG_DEBUG("\n\n"); @@ -602,11 +609,27 @@ void CreateGanonText() { ganonHintText = hint.GetText()+Hint(YOUR_POCKET).GetText(); lightArrowHintLoc = "Link's Pocket"; } else { - ganonHintText = hint.GetText()+GetHintRegion(Location(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText(); + ganonHintText = hint.GetText() + "%r" + GetHintRegion(Location(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText(); lightArrowHintLoc = Location(lightArrowLocation[0])->GetName(); } ganonHintText = ganonHintText + "!"; + if (ShuffleMasterSword) { + //Get the location of the master sword + auto masterSwordLocation = FilterFromPool(allLocations, [](const LocationKey loc){return Location(loc)->GetPlacedItemKey() == MASTER_SWORD;}); + + // Add second text box + ganonHintText = ganonHintText + "^"; + if (masterSwordLocation.empty()) { + ganonHintText = ganonHintText+Hint(MASTER_SWORD_LOCATION_HINT).GetText()+Hint(YOUR_POCKET).GetText(); + masterSwordHintLoc = "Link's Pocket"; + } else { + ganonHintText = ganonHintText+Hint(MASTER_SWORD_LOCATION_HINT).GetText()+GetHintRegion(Location(masterSwordLocation[0])->GetParentRegionKey())->GetHint().GetText(); + masterSwordHintLoc = Location(masterSwordLocation[0])->GetName(); + } + ganonHintText = ganonHintText + "!"; + } + CreateMessageFromTextObject(0x70CC, 0, 2, 3, AddColorsAndFormat(ganonHintText)); } @@ -814,9 +837,9 @@ void CreateDampesDiaryText() { uint32_t location = FilterFromPool(allLocations, [item](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == item;})[0]; Text area = GetHintRegion(Location(location)->GetParentRegionKey())->GetHint().GetText(); Text temp1 = Text{ - "Whoever reads this, please enter %g", - "Toi qui lit ce journal, rends-toi dans %g", - "Wer immer dies liest, der möge folgenden Ort aufsuchen: %g" + "Whoever reads this, please enter %r", + "Toi qui lit ce journal, rends-toi dans %r", + "Wer immer dies liest, der möge folgenden Ort aufsuchen: %r" }; Text temp2 = { @@ -839,13 +862,13 @@ void CreateGregRupeeHint() { Text area = GetHintRegion(Location(location)->GetParentRegionKey())->GetHint().GetText(); Text temp1 = Text{ - "By the way, if you're interested, I saw the shiniest %gGreen Rupee%w somewhere in%g ", - "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des %gRubis Verts%w quelque part à %g", + "By the way, if you're interested, I saw the shiniest %gGreen Rupee%w somewhere in%r ", + "Au fait, si ça t'intéresse, j'ai aperçu le plus éclatant des %gRubis Verts%w quelque part à %r", "" }; Text temp2 = { - "%w.^It's said to have %rmysterious powers%w...^But then, it could just be another regular rupee.&Oh well.", + "%w.^It's said to have %cmysterious powers%w...^But then, it could just be another regular rupee.&Oh well.", "%w. On dit qu'il possède des pouvoirs mystérieux... Mais bon, ça pourrait juste être un autre rubis ordinaire.", "" }; @@ -859,12 +882,24 @@ void CreateSheikText() { lightArrowHintLoc = Location(lightArrowLocation[0])->GetName(); Text area = GetHintRegion(Location(lightArrowLocation[0])->GetParentRegionKey())->GetHint().GetText(); Text temp1 = Text{ - "I overheard Ganondorf say that he misplaced the %rLight Arrows%w in&%g", - "J'ai entendu dire que Ganondorf aurait caché les %rFlèches de Lumière%w dans %g", + "I overheard Ganondorf say that he misplaced the %yLight Arrows%w in %r", + "J'ai entendu dire que Ganondorf aurait caché les %yFlèches de Lumière%w dans %r", "" }; Text temp2 = Text{"%w.", "%w.", "%w."}; sheikText = temp1 + area + temp2; + if (ShuffleMasterSword) { + sheikText = sheikText + "^"; + auto masterSwordLocation = FilterFromPool(allLocations, [](const uint32_t loc){return Location(loc)->GetPlaceduint32_t() == MASTER_SWORD;}); + masterSwordHintLoc = Location(masterSwordLocation[0])->GetName(); + area = GetHintRegion(Location(masterSwordLocation[0])->GetParentRegionKey())->GetHint().GetText(); + Text temp3 = Text{ + "I also heard that he stole %rthe Master Sword%w and hid it somewhere within %g", + "Test", + "Test" + }; + sheikText = sheikText + temp3 + area + temp2; + } } void CreateSariaText() { @@ -873,8 +908,8 @@ void CreateSariaText() { sariaHintLoc = Location(magicLocation[0])->GetName(); Text area = GetHintRegion(Location(magicLocation[0])->GetParentRegionKey())->GetHint().GetText(); Text temp1 = Text{ - "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %g", - "As-tu récemment ressenti une vague de %gpuissance magique%w? Un mystérieux hibou m'a dit qu'elle provenait du %g", + "Did you feel the %gsurge of magic%w recently? A mysterious bird told me it came from %r", + "As-tu récemment ressenti une vague de %gpuissance magique%w? Un mystérieux hibou m'a dit qu'elle provenait du %r", "" }; Text temp2 = Text{ diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp index 83985c0da..9bc6d61db 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp @@ -43,6 +43,7 @@ enum class HintCategory { Altar, Validation, LightArrow, + MasterSword, GanonLine, MerchantsDialogs, }; @@ -116,6 +117,10 @@ public: return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::LightArrow}; } + static auto MasterSword(std::vector&& obscureText, std::vector&& ambiguousText = {}, Text&& clearText = {}) { + return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::MasterSword}; + } + static auto GanonLine(std::vector&& obscureText, std::vector&& ambiguousText = {}, Text&& clearText = {}) { return HintText{std::move(obscureText), std::move(ambiguousText), std::move(clearText), HintCategory::GanonLine}; } @@ -228,5 +233,6 @@ Text& GetWarpNocturneText(); Text& GetWarpPreludeText(); std::string GetDampeHintLoc(); +std::string GetMasterSwordHintLoc(); std::string GetLightArrowHintLoc(); std::string GetSariaHintLoc(); diff --git a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp index 417203a5b..34e9c779f 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp @@ -12,7 +12,7 @@ static std::array itemTable; void ItemTable_Init() { // RandomizerGet English name French Spanish Item Type getItemID advancement logic hint key itemTable[NONE] = Item(RG_NONE, Text{"No Item", "Rien", "Sin Objeto"}, ITEMTYPE_EVENT, GI_RUPEE_GREEN, false, &noVariable, NONE); itemTable[KOKIRI_SWORD] = Item(RG_KOKIRI_SWORD, Text{"Kokiri Sword", "Épée Kokiri", "Espada Kokiri"}, ITEMTYPE_ITEM, GI_SWORD_KOKIRI, true, &KokiriSword, KOKIRI_SWORD); - //[MASTER_SWORD] + itemTable[MASTER_SWORD] = Item(RG_MASTER_SWORD, Text{"Master Sword", "Épée de Legende", "Espada Master"}, ITEMTYPE_ITEM, 0xE0, true, &MasterSword, MASTER_SWORD); itemTable[GIANTS_KNIFE] = Item(RG_GIANTS_KNIFE, Text{"Giant's Knife", "Lame des Géants", "Espada de Biggoron"}, ITEMTYPE_ITEM, GI_SWORD_KNIFE, false, &noVariable, GIANTS_KNIFE); itemTable[BIGGORON_SWORD] = Item(RG_BIGGORON_SWORD, Text{"Biggoron's Sword", "Épée de Biggoron", "Espada de Biggoron"}, ITEMTYPE_ITEM, GI_SWORD_BGS, true, &BiggoronSword, BIGGORON_SWORD); itemTable[DEKU_SHIELD] = Item(RG_DEKU_SHIELD, Text{"Deku Shield", "Bouclier Mojo", "Escudo deku"}, ITEMTYPE_ITEM, GI_SHIELD_DEKU, false, &noVariable, DEKU_SHIELD); diff --git a/soh/soh/Enhancements/randomizer/3drando/item_location.cpp b/soh/soh/Enhancements/randomizer/3drando/item_location.cpp index 1c085021c..577de1c19 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_location.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_location.cpp @@ -754,7 +754,7 @@ void LocationTable_Init() { /*------------------------------- --- CUTSCENES --- -------------------------------*/ - + locationTable[TOT_MASTER_SWORD] = ItemLocation::Delayed(RC_TOT_MASTER_SWORD, 0xFF, "ToT Master Sword", TOT_MASTER_SWORD, MASTER_SWORD, {}, SpoilerCollectionCheck::MasterSword(), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); locationTable[TOT_LIGHT_ARROWS_CUTSCENE] = ItemLocation::Delayed(RC_TOT_LIGHT_ARROWS_CUTSCENE, 0xFF, "ToT Light Arrow Cutscene", TOT_LIGHT_ARROWS_CUTSCENE, LIGHT_ARROWS, {}, SpoilerCollectionCheck::Chest(0x43, 0x1E), SpoilerCollectionCheckGroup::GROUP_HYRULE_CASTLE); locationTable[LW_GIFT_FROM_SARIA] = ItemLocation::Delayed(RC_LW_GIFT_FROM_SARIA, 0xFF, "LW Gift From Saria", LW_GIFT_FROM_SARIA, PROGRESSIVE_OCARINA, {}, SpoilerCollectionCheck::EventChkInf(0xC1), SpoilerCollectionCheckGroup::GROUP_LOST_WOODS); locationTable[ZF_GREAT_FAIRY_REWARD] = ItemLocation::Delayed(RC_ZF_GREAT_FAIRY_REWARD, 0xFF, "ZF Great Fairy Reward", ZF_GREAT_FAIRY_REWARD, FARORES_WIND, {}, SpoilerCollectionCheck::Chest(0x3D, 0x01), SpoilerCollectionCheckGroup::GROUP_ZORAS_DOMAIN); @@ -1265,6 +1265,7 @@ std::vector overworldLocations = { OGC_GREAT_FAIRY_REWARD, //Temple of Time + TOT_MASTER_SWORD, SHEIK_AT_TEMPLE, TOT_LIGHT_ARROWS_CUTSCENE, diff --git a/soh/soh/Enhancements/randomizer/3drando/item_location.hpp b/soh/soh/Enhancements/randomizer/3drando/item_location.hpp index e900ab941..5a61c2986 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_location.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_location.hpp @@ -149,9 +149,14 @@ class SpoilerCollectionCheck { static auto MagicBeans() { return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MAGIC_BEANS, 0x00, 0x00); } + + static auto MasterSword() { + return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD, 0x00, 0x00); + } static auto Merchant() { return SpoilerCollectionCheck(SpoilerCollectionCheckType::SPOILER_CHK_MERCHANT, 0x00, 0x00); + } static auto RandomizerInf() { diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp index 485fc4154..1eb496eb2 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp @@ -108,9 +108,10 @@ const std::array alwaysItems = { ARROWS_10, TREASURE_GAME_HEART, }; -const std::array easyItems = { +const std::array easyItems = { BIGGORON_SWORD, KOKIRI_SWORD, + MASTER_SWORD, BOOMERANG, LENS_OF_TRUTH, MEGATON_HAMMER, @@ -682,6 +683,13 @@ void GenerateItemPool() { PlaceItemInLocation(KF_KOKIRI_SWORD_CHEST, KOKIRI_SWORD, false, true); } + if (ShuffleMasterSword) { + AddItemToMainPool(MASTER_SWORD); + IceTrapModels.push_back(0xE0); //Master Sword without the GI enum + } else { + PlaceItemInLocation(TOT_MASTER_SWORD, MASTER_SWORD, false, true); + } + if (ShuffleWeirdEgg) { AddItemToMainPool(WEIRD_EGG); IceTrapModels.push_back(GI_WEIRD_EGG); @@ -1161,6 +1169,10 @@ void GenerateItemPool() { ReplaceMaxItem(KOKIRI_SWORD, 0); } + if (!ShuffleMasterSword) { + ReplaceMaxItem(MASTER_SWORD, 0); + } + if (ProgressiveGoronSword) { ReplaceMaxItem(BIGGORON_SWORD, 0); AddItemToMainPool(PROGRESSIVE_GORONSWORD, 2); diff --git a/soh/soh/Enhancements/randomizer/3drando/keys.hpp b/soh/soh/Enhancements/randomizer/3drando/keys.hpp index 6e9e87f4e..95d31070e 100644 --- a/soh/soh/Enhancements/randomizer/3drando/keys.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/keys.hpp @@ -357,6 +357,7 @@ typedef enum { MARKET_BOMBCHU_SHOP_ITEM_6, MARKET_BOMBCHU_SHOP_ITEM_7, MARKET_BOMBCHU_SHOP_ITEM_8, + TOT_MASTER_SWORD, TOT_LIGHT_ARROWS_CUTSCENE, //HYRULE_CASTLE HC_MALON_EGG, @@ -1541,6 +1542,7 @@ typedef enum { GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, GANONS_CASTLE_LOBBY, + GANONS_CASTLE_MAIN, GANONS_CASTLE_DEKU_SCRUBS, GANONS_CASTLE_FOREST_TRIAL, GANONS_CASTLE_FIRE_TRIAL, @@ -1551,6 +1553,7 @@ typedef enum { GANONS_CASTLE_TOWER, GANONS_CASTLE_MQ_LOBBY, + GANONS_CASTLE_MQ_MAIN, GANONS_CASTLE_MQ_DEKU_SCRUBS, GANONS_CASTLE_MQ_FOREST_TRIAL, GANONS_CASTLE_MQ_FIRE_TRIAL, @@ -1804,6 +1807,7 @@ typedef enum { VALIDATION_LINE, LIGHT_ARROW_LOCATION_HINT, + MASTER_SWORD_LOCATION_HINT, DAMPE_DIARY, YOUR_POCKET, diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp index 6691ac2f2..dab5ceb36 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp @@ -64,13 +64,14 @@ void AreaTable_Init_CastleTown() { //EventAccess(&TimeTravel, {[]{return true;}}), }, { //Locations + LocationAccess(TOT_MASTER_SWORD, {[]{return IsAdult;}}), LocationAccess(SHEIK_AT_TEMPLE, {[]{return ForestMedallion && IsAdult;}}), }, { //Exits Entrance(TEMPLE_OF_TIME, {[]{return true;}}), }); - areaTable[CASTLE_GROUNDS] = Area("Castle Grounds", "Castle Grounds", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[CASTLE_GROUNDS] = Area("Castle Grounds", "Castle Grounds", CASTLE_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(THE_MARKET, {[]{return true;}}), Entrance(HYRULE_CASTLE_GROUNDS, {[]{return IsChild;}}), @@ -156,7 +157,7 @@ void AreaTable_Init_CastleTown() { Entrance(GANONS_CASTLE_LEDGE, { [] { return IsAdult; }}), }); - areaTable[GANONS_CASTLE_LEDGE] = Area("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", NONE, NO_DAY_NIGHT_CYCLE, + areaTable[GANONS_CASTLE_LEDGE] = Area("Ganon's Castle Ledge", "OGC Ganon's Castle Ledge", OUTSIDE_GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, { // Exits Entrance(GANONS_CASTLE_GROUNDS, {[]{return BuiltRainbowBridge;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp index b52be650e..8988b045b 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_death_mountain.cpp @@ -46,7 +46,7 @@ void AreaTable_Init_DeathMountain() { Entrance(DMT_GREAT_FAIRY_FOUNTAIN, {[]{return Here(DEATH_MOUNTAIN_SUMMIT, []{return CanBlastOrSmash;});}}), }); - areaTable[DMT_OWL_FLIGHT] = Area("DMT Owl Flight", "Death Mountain", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[DMT_OWL_FLIGHT] = Area("DMT Owl Flight", "Death Mountain", DEATH_MOUNTAIN_TRAIL, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(KAK_IMPAS_ROOFTOP, {[]{return true;}}), }); @@ -95,7 +95,7 @@ void AreaTable_Init_DeathMountain() { LocationAccess(GC_ROLLING_GORON_AS_CHILD, {[]{return IsChild && (HasExplosives || (GoronBracelet && LogicChildRollingWithStrength));}}), LocationAccess(GC_ROLLING_GORON_AS_ADULT, {[]{return StopGCRollingGoronAsAdult;}}), LocationAccess(GC_GS_BOULDER_MAZE, {[]{return IsChild && CanBlastOrSmash;}}), - LocationAccess(GC_GS_CENTER_PLATFORM, {[]{return IsAdult;}}), + LocationAccess(GC_GS_CENTER_PLATFORM, {[]{return CanAdultAttack;}}), LocationAccess(GC_MEDIGORON, {[]{return IsAdult && AdultsWallet && (CanBlastOrSmash || GoronBracelet);}}), LocationAccess(GC_MAZE_GOSSIP_STONE, {[]{return CanBlastOrSmash || CanUse(SILVER_GAUNTLETS);}}), LocationAccess(GC_MEDIGORON_GOSSIP_STONE, {[]{return CanBlastOrSmash || GoronBracelet;}}), @@ -108,7 +108,7 @@ void AreaTable_Init_DeathMountain() { Entrance(GC_GROTTO_PLATFORM, {[]{return IsAdult && ((CanPlay(SongOfTime) && ((EffectiveHealth > 2) || CanUse(GORON_TUNIC) || CanUse(LONGSHOT) || CanUse(NAYRUS_LOVE))) || (EffectiveHealth > 1 && CanUse(GORON_TUNIC) && CanUse(HOOKSHOT)) || (CanUse(NAYRUS_LOVE) && CanUse(HOOKSHOT)) || (EffectiveHealth > 2 && CanUse(HOOKSHOT) && LogicGoronCityGrotto));}}), }); - areaTable[GC_WOODS_WARP] = Area("GC Woods Warp", "Goron City", NONE, NO_DAY_NIGHT_CYCLE, { + areaTable[GC_WOODS_WARP] = Area("GC Woods Warp", "Goron City", GORON_CITY, NO_DAY_NIGHT_CYCLE, { //Events EventAccess(&GCWoodsWarpOpen, {[]{return GCWoodsWarpOpen || (CanBlastOrSmash || CanUse(DINS_FIRE));}}), }, {}, { diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp index c39676a82..2224df4ca 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_deku_tree.cpp @@ -23,8 +23,8 @@ void AreaTable_Init_DekuTree() { if (Dungeon::DekuTree.IsVanilla()) { areaTable[DEKU_TREE_LOBBY] = Area("Deku Tree Lobby", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(DEKU_TREE_MAP_CHEST, {[]{return true;}}), @@ -33,7 +33,7 @@ void AreaTable_Init_DekuTree() { Entrance(DEKU_TREE_ENTRYWAY, {[]{return true;}}), Entrance(DEKU_TREE_2F_MIDDLE_ROOM, {[]{return true;}}), Entrance(DEKU_TREE_COMPASS_ROOM, {[]{return true;}}), - Entrance(DEKU_TREE_BASEMENT_LOWER, {[]{return Here(DEKU_TREE_LOBBY, []{return IsAdult || CanChildAttack || Nuts;});}}), + Entrance(DEKU_TREE_BASEMENT_LOWER, {[]{return Here(DEKU_TREE_LOBBY, []{return CanAdultAttack || CanChildAttack || Nuts;});}}), Entrance(DEKU_TREE_OUTSIDE_BOSS_ROOM, {[]{return false;}}), Entrance(DEKU_TREE_BOSS_ENTRYWAY, {[]{return false;}}), }); @@ -55,13 +55,13 @@ void AreaTable_Init_DekuTree() { areaTable[DEKU_TREE_COMPASS_ROOM] = Area("Deku Tree Compass Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(DEKU_TREE_COMPASS_CHEST, {[]{return true;}}), LocationAccess(DEKU_TREE_COMPASS_ROOM_SIDE_CHEST, {[]{return true;}}), - LocationAccess(DEKU_TREE_GS_COMPASS_ROOM, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(DEKU_TREE_GS_COMPASS_ROOM, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(DEKU_TREE_LOBBY, {[]{return HasFireSourceWithTorch || CanUse(BOW);}}), @@ -70,14 +70,14 @@ void AreaTable_Init_DekuTree() { areaTable[DEKU_TREE_BASEMENT_LOWER] = Area("Deku Tree Basement Lower", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}, + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || Boomerang);}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}, /*Glitched*/[]{return CanUse(MEGATON_HAMMER);}}), }, { //Locations LocationAccess(DEKU_TREE_BASEMENT_CHEST, {[]{return true;}}), - LocationAccess(DEKU_TREE_GS_BASEMENT_GATE, {[]{return IsAdult || CanChildAttack;}}), - LocationAccess(DEKU_TREE_GS_BASEMENT_VINES, {[]{return CanUseProjectile || CanUse(DINS_FIRE) || (LogicDekuBasementGS && (IsAdult || Sticks || KokiriSword));}}), + LocationAccess(DEKU_TREE_GS_BASEMENT_GATE, {[]{return CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOOMERANG) || HasExplosives || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(DINS_FIRE);}}), + LocationAccess(DEKU_TREE_GS_BASEMENT_VINES, {[]{return CanUseProjectile || CanUse(DINS_FIRE) || (LogicDekuBasementGS && CanJumpslash);}}), }, { //Exits Entrance(DEKU_TREE_LOBBY, {[]{return true;}}), @@ -100,8 +100,8 @@ void AreaTable_Init_DekuTree() { areaTable[DEKU_TREE_BASEMENT_TORCH_ROOM] = Area("Deku Tree Basement Torch Room", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, {}, { //Exits Entrance(DEKU_TREE_BASEMENT_WATER_ROOM, {[]{return true;}}), @@ -110,9 +110,9 @@ void AreaTable_Init_DekuTree() { areaTable[DEKU_TREE_BASEMENT_BACK_LOBBY] = Area("Deku Tree Basement Back Lobby", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (Here(DEKU_TREE_BASEMENT_BACK_LOBBY, []{return HasFireSourceWithTorch || CanUse(BOW);}) && - (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE)));}}), + (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE)));}}), }, {}, { //Exits Entrance(DEKU_TREE_BASEMENT_TORCH_ROOM, {[]{return true;}}), @@ -131,8 +131,8 @@ void AreaTable_Init_DekuTree() { areaTable[DEKU_TREE_BASEMENT_UPPER] = Area("Deku Tree Basement Upper", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, {}, { //Exits Entrance(DEKU_TREE_BASEMENT_LOWER, {[]{return true;}}), @@ -153,15 +153,15 @@ void AreaTable_Init_DekuTree() { if (Dungeon::DekuTree.IsMQ()) { areaTable[DEKU_TREE_MQ_LOBBY] = Area("Deku Tree MQ Lobby", "Deku Tree", DEKU_TREE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(DEKU_TREE_MQ_MAP_CHEST, {[]{return true;}}), - LocationAccess(DEKU_TREE_MQ_SLINGSHOT_CHEST, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(DEKU_TREE_MQ_SLINGSHOT_CHEST, {[]{return CanAdultAttack || CanChildAttack;}}), LocationAccess(DEKU_TREE_MQ_SLINGSHOT_ROOM_BACK_CHEST, {[]{return HasFireSourceWithTorch || (IsAdult && CanUse(BOW));}}), LocationAccess(DEKU_TREE_MQ_BASEMENT_CHEST, {[]{return HasFireSourceWithTorch || (IsAdult && CanUse(BOW));}}), - LocationAccess(DEKU_TREE_MQ_GS_LOBBY, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(DEKU_TREE_MQ_GS_LOBBY, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(DEKU_TREE_ENTRYWAY, {[]{return true;}}), @@ -201,7 +201,8 @@ void AreaTable_Init_DekuTree() { //Exits Entrance(DEKU_TREE_MQ_BASEMENT_BACK_ROOM, {[]{return Here(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return (IsChild && CanUse(STICKS)) || CanUse(DINS_FIRE) || Here(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, []{return IsAdult && CanUse(FIRE_ARROWS);});}) && - Here(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return IsAdult || KokiriSword || CanUseProjectile || (Nuts && Sticks);});}}), + Here(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_BACK, []{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || + CanUseProjectile || (Nuts && CanUse(STICKS));});}}), Entrance(DEKU_TREE_MQ_BASEMENT_WATER_ROOM_FRONT, {[]{return true;}}), }); diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp index 133cdc340..9f8effbcc 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_dodongos_cavern.cpp @@ -54,17 +54,17 @@ void AreaTable_Init_DodongosCavern() { areaTable[DODONGOS_CAVERN_SE_CORRIDOR] = Area("Dodongos Cavern SE Corridor", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(DODONGOS_CAVERN_GS_SCARECROW, {[]{return CanUse(SCARECROW) || (IsAdult && CanUse(LONGSHOT)) || (LogicDCScarecrowGS && (IsAdult || CanChildAttack));}}), + LocationAccess(DODONGOS_CAVERN_GS_SCARECROW, {[]{return CanUse(SCARECROW) || (IsAdult && CanUse(LONGSHOT)) || (LogicDCScarecrowGS && (CanAdultAttack || CanChildAttack));}}), }, { //Exits Entrance(DODONGOS_CAVERN_LOBBY, {[]{return true;}}), - Entrance(DODONGOS_CAVERN_SE_ROOM, {[]{return Here(DODONGOS_CAVERN_SE_CORRIDOR, []{return CanBlastOrSmash || IsAdult || CanChildAttack || (CanTakeDamage && CanShield);});}}), + Entrance(DODONGOS_CAVERN_SE_ROOM, {[]{return Here(DODONGOS_CAVERN_SE_CORRIDOR, []{return CanBlastOrSmash || CanAdultAttack || CanChildAttack || (CanTakeDamage && CanShield);});}}), Entrance(DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return true;}}), }); areaTable[DODONGOS_CAVERN_SE_ROOM] = Area("Dodongos Cavern SE Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(DODONGOS_CAVERN_SE_CORRIDOR, {[]{return true;}}), @@ -78,8 +78,10 @@ void AreaTable_Init_DodongosCavern() { areaTable[DODONGOS_CAVERN_LOWER_LIZALFOS] = Area("Dodongos Cavern Lower Lizalfos", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}), - Entrance(DODONGOS_CAVERN_DODONGO_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}), + Entrance(DODONGOS_CAVERN_NEAR_LOWER_LIZALFOS, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(BOW) || CanUse(SLINGSHOT) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || + CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || HasExplosives;});}}), + Entrance(DODONGOS_CAVERN_DODONGO_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(BOW) || CanUse(SLINGSHOT) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || + CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || HasExplosives;});}}), }); areaTable[DODONGOS_CAVERN_DODONGO_ROOM] = Area("Dodongos Cavern Dodongo Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { @@ -119,7 +121,7 @@ void AreaTable_Init_DodongosCavern() { LocationAccess(DODONGOS_CAVERN_COMPASS_CHEST, {[]{return true;}}), }, { //Exits - Entrance(DODONGOS_CAVERN_STAIRS_LOWER, {[]{return IsAdult || HasExplosives || GoronBracelet;}}), + Entrance(DODONGOS_CAVERN_STAIRS_LOWER, {[]{return CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || HasExplosives || GoronBracelet;}}), }); areaTable[DODONGOS_CAVERN_ARMOS_ROOM] = Area("Dodongos Cavern Armos Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { @@ -156,8 +158,10 @@ void AreaTable_Init_DodongosCavern() { areaTable[DODONGOS_CAVERN_UPPER_LIZALFOS] = Area("Dodongos Cavern Upper Lizalfos", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(DODONGOS_CAVERN_LOWER_LIZALFOS, {[]{return true;}}), - Entrance(DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}), - Entrance(DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return IsAdult || Slingshot || Sticks || KokiriSword || HasExplosives;});}}), + Entrance(DODONGOS_CAVERN_FIRST_SLINGSHOT_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(BOW) || CanUse(SLINGSHOT) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || + CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || HasExplosives;});}}), + Entrance(DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM, {[]{return Here(DODONGOS_CAVERN_LOWER_LIZALFOS, []{return CanUse(BOW) || CanUse(SLINGSHOT) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || + CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || HasExplosives;});}}), }); areaTable[DODONGOS_CAVERN_SECOND_SLINGSHOT_ROOM] = Area("Dodongos Cavern Second Slingshot Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { @@ -197,7 +201,7 @@ void AreaTable_Init_DodongosCavern() { areaTable[DODONGOS_CAVERN_BACK_ROOM] = Area("Dodongos Cavern Back Room", "Dodongos Cavern", DODONGOS_CAVERN, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(DODONGOS_CAVERN_GS_BACK_ROOM, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(DODONGOS_CAVERN_GS_BACK_ROOM, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(DODONGOS_CAVERN_BOSS_AREA, {[]{return true;}}), @@ -221,10 +225,10 @@ void AreaTable_Init_DodongosCavern() { }, { //Locations LocationAccess(DODONGOS_CAVERN_MQ_MAP_CHEST, {[]{return true;}}), - LocationAccess(DODONGOS_CAVERN_MQ_COMPASS_CHEST, {[]{return IsAdult || CanChildAttack || Nuts;}}), + LocationAccess(DODONGOS_CAVERN_MQ_COMPASS_CHEST, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}), LocationAccess(DODONGOS_CAVERN_MQ_LARVAE_ROOM_CHEST, {[]{return (IsChild && CanUse(STICKS)) || HasFireSource;}}), LocationAccess(DODONGOS_CAVERN_MQ_TORCH_PUZZLE_ROOM_CHEST, {[]{return CanBlastOrSmash || (IsChild && CanUse(STICKS)) || CanUse(DINS_FIRE) || (IsAdult && (LogicDCJump || HoverBoots || Hookshot));}}), - LocationAccess(DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return CanPlay(SongOfTime) && (CanChildAttack || IsAdult);}}), + LocationAccess(DODONGOS_CAVERN_MQ_GS_SONG_OF_TIME_BLOCK_ROOM, {[]{return CanPlay(SongOfTime) && (CanChildAttack || CanAdultAttack);}}), LocationAccess(DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM, {[]{return (IsChild && CanUse(STICKS)) || HasFireSource;}}), LocationAccess(DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM, {[]{return CanBlastOrSmash;}}), LocationAccess(DODONGOS_CAVERN_MQ_DEKU_SCRUB_LOBBY_REAR, {[]{return CanStunDeku;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp index 887766fe5..440483af6 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_fire_temple.cpp @@ -46,12 +46,12 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_LOOP_ENEMIES] = Area("Fire Temple Loop Enemies", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(FIRE_TEMPLE_FIRST_ROOM, {[]{return SmallKeys(FIRE_TEMPLE, 8) || !IsKeysanity;}}), - Entrance(FIRE_TEMPLE_LOOP_TILES, {[]{return Here(FIRE_TEMPLE_LOOP_ENEMIES, []{return IsAdult || KokiriSword;});}}), + Entrance(FIRE_TEMPLE_LOOP_TILES, {[]{return Here(FIRE_TEMPLE_LOOP_ENEMIES, []{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);});}}), }); areaTable[FIRE_TEMPLE_LOOP_TILES] = Area("Fire Temple Loop Tiles", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(FIRE_TEMPLE_GS_BOSS_KEY_LOOP, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(FIRE_TEMPLE_LOOP_ENEMIES, {[]{return true;}}), @@ -64,7 +64,8 @@ void AreaTable_Init_FireTemple() { }, { //Exits Entrance(FIRE_TEMPLE_LOOP_TILES, {[]{return true;}}), - Entrance(FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return Here(FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return (HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}), + Entrance(FIRE_TEMPLE_LOOP_HAMMER_SWITCH, {[]{return Here(FIRE_TEMPLE_LOOP_FLARE_DANCER, []{return CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT) || (HasExplosives && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || + CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(BOOMERANG)));});}}), }); areaTable[FIRE_TEMPLE_LOOP_HAMMER_SWITCH] = Area("Fire Temple Loop Hammer Switch", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, { @@ -110,7 +111,7 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_BIG_LAVA_ROOM_NORTH_TILES] = Area("Fire Temple Big Lava Room North Tiles", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {[]{return IsAdult;}}), + LocationAccess(FIRE_TEMPLE_GS_SONG_OF_TIME_ROOM, {[]{return CanAdultAttack || HookshotOrBoomerang;}}), }, { //Exits Entrance(FIRE_TEMPLE_BIG_LAVA_ROOM, {[]{return true;}}), @@ -137,7 +138,7 @@ void AreaTable_Init_FireTemple() { //Exits Entrance(FIRE_TEMPLE_FIRE_PILLAR_ROOM, {[]{return SmallKeys(FIRE_TEMPLE, 4);}}), Entrance(FIRE_TEMPLE_SHORTCUT_CLIMB, {[]{return Here(FIRE_TEMPLE_SHORTCUT_CLIMB, []{return true;});}}), - Entrance(FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return (GoronBracelet || (IsAdult && LogicFireStrength)) && (HasExplosives || (IsAdult && (CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(SLINGSHOT))));}}), + Entrance(FIRE_TEMPLE_BOULDER_MAZE_LOWER, {[]{return IsAdult && (GoronBracelet || LogicFireStrength) && (HasExplosives || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(SLINGSHOT));}}), }); areaTable[FIRE_TEMPLE_SHORTCUT_CLIMB] = Area("Fire Temple Shortcut Climb", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { @@ -149,7 +150,7 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_BOULDER_MAZE_LOWER] = Area("Fire Temple Boulder Maze Lower", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(FIRE_TEMPLE_BOULDER_MAZE_LOWER_CHEST, {[]{return true;}}), - LocationAccess(FIRE_TEMPLE_GS_BOULDER_MAZE, {[]{return HasExplosives && (IsAdult || Boomerang || CanUse(HOOKSHOT));}}), + LocationAccess(FIRE_TEMPLE_GS_BOULDER_MAZE, {[]{return HasExplosives && (IsAdult || HookshotOrBoomerang);}}), }, { //Exits Entrance(FIRE_TEMPLE_SHORTCUT_ROOM, {[]{return true;}}), @@ -203,7 +204,7 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_SCARECROW_ROOM] = Area("Fire Temple Scarecrow Room", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_GS_SCARECROW_CLIMB, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(FIRE_TEMPLE_GS_SCARECROW_CLIMB, {[]{return CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOOMERANG) || HasExplosives || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(DINS_FIRE);}}), }, { //Exits Entrance(FIRE_TEMPLE_BOULDER_MAZE_UPPER, {[]{return true;}}), @@ -276,8 +277,10 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_UPPER_FLARE_DANCER] = Area("Fire Temple Upper Flare Dancer", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return (HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}), - Entrance(FIRE_TEMPLE_WEST_CLIMB, {[]{return Here(FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return (HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT)) && (IsAdult || KokiriSword || Slingshot || Boomerang);});}}), + Entrance(FIRE_TEMPLE_LATE_FIRE_MAZE, {[]{return Here(FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT) || (HasExplosives && ((CanUse(KOKIRI_SWORD)) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || + CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(BOOMERANG)));});}}), + Entrance(FIRE_TEMPLE_WEST_CLIMB, {[]{return Here(FIRE_TEMPLE_UPPER_FLARE_DANCER, []{return CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT) || (HasExplosives && ((CanUse(KOKIRI_SWORD)) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || + CanUse(SLINGSHOT) || CanUse(BOOMERANG)));});}}), }); areaTable[FIRE_TEMPLE_WEST_CLIMB] = Area("Fire Temple West Climb", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { @@ -314,14 +317,14 @@ void AreaTable_Init_FireTemple() { if (Dungeon::FireTemple.IsMQ()) { areaTable[FIRE_TEMPLE_MQ_LOWER] = Area("Fire Temple MQ Lower", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, {[]{return IsAdult || KokiriSword || Sticks || Slingshot || Bombs || CanUse(DINS_FIRE);}}), + LocationAccess(FIRE_TEMPLE_MQ_MAP_ROOM_SIDE_CHEST, {[]{return CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || Bombs || CanUse(DINS_FIRE);}}), LocationAccess(FIRE_TEMPLE_MQ_NEAR_BOSS_CHEST, {[]{return IsAdult && (LogicFewerTunicRequirements || CanUse(GORON_TUNIC)) && (((CanUse(HOVER_BOOTS) || (LogicFireMQNearBoss && CanUse(BOW))) && HasFireSource) || (CanUse(HOOKSHOT) && CanUse(FIRE_ARROWS) || (CanUse(DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || CanUse(GORON_TUNIC) || CanUse(BOW) || CanUse(LONGSHOT)))));}}), //Trick: IsAdult && (LogicFewerTunicRequirements || CanUse(GORON_TUNIC)) && (((CanUse(HOVER_BOOTS) || (LogicFireMQNearBoss && CanUse(BOW))) && HasFireSource) || (CanUse(HOOKSHOT) && CanUse(FIRE_ARROWS) || (CanUse(DINS_FIRE) && ((DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OHKO) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_QUADRUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_OCTUPLE) && DamageMultiplier.IsNot(DAMAGEMULTIPLIER_SEXDECUPLE)) || CanUse(GORON_TUNIC) || CanUse(BOW) || CanUse(LONGSHOT))))) }, { //Exits Entrance(FIRE_TEMPLE_ENTRYWAY, {[]{return true;}}), Entrance(FIRE_TEMPLE_BOSS_ENTRYWAY, {[]{return IsAdult && CanUse(GORON_TUNIC) && CanUse(MEGATON_HAMMER) && BossKeyFireTemple && ((HasFireSource && (LogicFireBossDoorJump || HoverBoots)) || HasAccessTo(FIRE_TEMPLE_MQ_UPPER));}}), - Entrance(FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR, {[]{return SmallKeys(FIRE_TEMPLE, 5) && (IsAdult || KokiriSword);}}), + Entrance(FIRE_TEMPLE_MQ_LOWER_LOCKED_DOOR, {[]{return SmallKeys(FIRE_TEMPLE, 5) && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD));}}), Entrance(FIRE_TEMPLE_MQ_BIG_LAVA_ROOM, {[]{return IsAdult && FireTimer >= 24 && CanUse(MEGATON_HAMMER);}}), }); @@ -330,7 +333,7 @@ void AreaTable_Init_FireTemple() { EventAccess(&FairyPot, {[]{return true;}}), }, { //Locations - LocationAccess(FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, {[]{return IsAdult && (HasExplosives || Hammer || Hookshot);}}), + LocationAccess(FIRE_TEMPLE_MQ_MEGATON_HAMMER_CHEST, {[]{return IsAdult && (CanUse(MEGATON_HAMMER) || CanUse(HOOKSHOT) || (HasExplosives && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOW) || CanUse(SLINGSHOT) || CanUse(BOOMERANG))));}}), LocationAccess(FIRE_TEMPLE_MQ_MAP_CHEST, {[]{return IsAdult && CanUse(MEGATON_HAMMER);}}), }, {}); @@ -353,7 +356,7 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_MQ_LOWER_MAZE] = Area("Fire Temple MQ Lower Maze", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST, {[]{return true;}}), + LocationAccess(FIRE_TEMPLE_MQ_LIZALFOS_MAZE_LOWER_CHEST, {[]{return CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD);}}), LocationAccess(FIRE_TEMPLE_MQ_LIZALFOS_MAZE_SIDE_ROOM_CHEST, {[]{return HasExplosives && (LogicFireMQMazeSideRoom || HasAccessTo(FIRE_TEMPLE_MQ_UPPER_MAZE));}}), //Trick: HasExplosives && (LogicFireMQMazeSideRoom || FIRE_TEMPLE_MQ_UPPER_MAZE.Adult()) }, { @@ -378,7 +381,7 @@ void AreaTable_Init_FireTemple() { areaTable[FIRE_TEMPLE_MQ_UPPER] = Area("Fire Temple MQ Upper", "Fire Temple", FIRE_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FIRE_TEMPLE_MQ_FREESTANDING_KEY, {[]{return (IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze;}}), + LocationAccess(FIRE_TEMPLE_MQ_FREESTANDING_KEY, {[]{return ((CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(SLINGSHOT) || CanUse(BOOMERANG)) && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze;}}), //Trick: (IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze LocationAccess(FIRE_TEMPLE_MQ_CHEST_ON_FIRE, {[]{return ((IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(FIRE_TEMPLE, 4);}}), //Trick: ((IsAdult && CanUse(HOOKSHOT)) || LogicFireMQFlameMaze) && SmallKeys(FIRE_TEMPLE, 4) diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp index d4e95e15c..fea9fda6f 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_forest_temple.cpp @@ -34,7 +34,7 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_SOUTH_CORRIDOR] = Area("Forest Temple South Corridor", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(FOREST_TEMPLE_FIRST_ROOM, {[]{return true;}}), - Entrance(FOREST_TEMPLE_LOBBY, {[]{return IsAdult || CanChildAttack || Nuts;}}), + Entrance(FOREST_TEMPLE_LOBBY, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}), }); areaTable[FOREST_TEMPLE_LOBBY] = Area("Forest Temple Lobby", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { @@ -66,7 +66,7 @@ void AreaTable_Init_ForestTemple() { EventAccess(&FairyPot, {[]{return true;}}), }, { //Locations - LocationAccess(FOREST_TEMPLE_FIRST_STALFOS_CHEST, {[]{return IsAdult || KokiriSword;}}), + LocationAccess(FOREST_TEMPLE_FIRST_STALFOS_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), }, { //Exits Entrance(FOREST_TEMPLE_NORTH_CORRIDOR, {[]{return true;}}), @@ -74,8 +74,8 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_NW_OUTDOORS_LOWER] = Area("Forest Temple NW Outdoors Lower", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD, {[]{return CanUse(LONGSHOT) || Here(FOREST_TEMPLE_NW_OUTDOORS_UPPER, []{return HookshotOrBoomerang;});}}), @@ -90,8 +90,8 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_NW_OUTDOORS_UPPER] = Area("Forest Temple NW Outdoors Upper", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, {}, { //Exits Entrance(FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return true;}}), @@ -102,8 +102,8 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_NE_OUTDOORS_LOWER] = Area("Forest Temple NE Outdoors Lower", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(FOREST_TEMPLE_RAISED_ISLAND_COURTYARD_CHEST, {[]{return CanUse(HOOKSHOT) || HasAccessTo(FOREST_TEMPLE_FALLING_ROOM) || (HasAccessTo(FOREST_TEMPLE_NE_OUTDOORS_UPPER) && IsAdult && LogicForestOutdoorsLedge && HoverBoots);}}), @@ -118,22 +118,22 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_NE_OUTDOORS_UPPER] = Area("Forest Temple NE Outdoors Upper", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, {}, { //Exits Entrance(FOREST_TEMPLE_NE_OUTDOORS_LOWER, {[]{return true;}}), Entrance(FOREST_TEMPLE_MAP_ROOM, {[]{return true;}}), - Entrance(FOREST_TEMPLE_FALLING_ROOM, {[]{return LogicForestDoorFrame && CanUse(HOVER_BOOTS) && CanUse(SCARECROW);}}), + Entrance(FOREST_TEMPLE_FALLING_ROOM, {[]{return LogicForestDoorFrame && CanJumpslash && CanUse(HOVER_BOOTS) && CanUse(SCARECROW);}}), }); areaTable[FOREST_TEMPLE_MAP_ROOM] = Area("Forest Temple Map Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_MAP_CHEST, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}), + LocationAccess(FOREST_TEMPLE_MAP_CHEST, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((CanJumpslash || CanUse(SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}), }, { //Exits - Entrance(FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}), - Entrance(FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}), + Entrance(FOREST_TEMPLE_NW_OUTDOORS_LOWER, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((CanJumpslash || CanUse(SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}), + Entrance(FOREST_TEMPLE_NE_OUTDOORS_UPPER, {[]{return Here(FOREST_TEMPLE_MAP_ROOM, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((CanJumpslash || CanUse(SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}), }); areaTable[FOREST_TEMPLE_SEWER] = Area("Forest Temple Sewer", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -147,12 +147,12 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST] = Area("Forest Temple Below Boss Key Chest", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((IsAdult || Sticks || KokiriSword || Slingshot) && (Nuts || HookshotOrBoomerang || CanShield));});}}), + Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return Here(FOREST_TEMPLE_BELOW_BOSS_KEY_CHEST, []{return HasExplosives || CanUse(MEGATON_HAMMER) || CanUse(BOW) || ((CanJumpslash || CanUse(SLINGSHOT)) && (Nuts || HookshotOrBoomerang || CanShield));});}}), }); areaTable[FOREST_TEMPLE_FLOORMASTER_ROOM] = Area("Forest Temple Floormaster Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_FLOORMASTER_CHEST, {[]{return IsAdult || CanChildDamage;}}), + LocationAccess(FOREST_TEMPLE_FLOORMASTER_CHEST, {[]{return CanAdultDamage || CanChildDamage;}}), }, { //Exits Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return true;}}), @@ -161,7 +161,7 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_WEST_CORRIDOR] = Area("Forest Temple West Corridor", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(FOREST_TEMPLE_LOBBY, {[]{return SmallKeys(FOREST_TEMPLE, 1, 5);}}), - Entrance(FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return IsAdult || CanChildAttack || Nuts;}}), + Entrance(FOREST_TEMPLE_BLOCK_PUSH_ROOM, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}), }); areaTable[FOREST_TEMPLE_BLOCK_PUSH_ROOM] = Area("Forest Temple Block Push Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -172,7 +172,7 @@ void AreaTable_Init_ForestTemple() { Entrance(FOREST_TEMPLE_WEST_CORRIDOR, {[]{return true;}}), Entrance(FOREST_TEMPLE_NW_OUTDOORS_UPPER, {[]{return CanUse(HOVER_BOOTS) || (LogicForestOutsideBackdoor && CanJumpslash && GoronBracelet);}}), Entrance(FOREST_TEMPLE_NW_CORRIDOR_TWISTED, {[]{return IsAdult && GoronBracelet && SmallKeys(FOREST_TEMPLE, 2);}}), - Entrance(FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return CanUse(BOW) && GoronBracelet && SmallKeys(FOREST_TEMPLE, 2);}}), + Entrance(FOREST_TEMPLE_NW_CORRIDOR_STRAIGHTENED, {[]{return (CanUse(BOW) || CanUse(SLINGSHOT)) && GoronBracelet && SmallKeys(FOREST_TEMPLE, 2);}}), }); areaTable[FOREST_TEMPLE_NW_CORRIDOR_TWISTED] = Area("Forest Temple NW Corridor Twisted", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { @@ -204,11 +204,11 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_UPPER_STALFOS] = Area("Forest Temple Upper Stalfos", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_BOW_CHEST, {[]{return IsAdult || KokiriSword;}}), + LocationAccess(FOREST_TEMPLE_BOW_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), }, { //Exits - Entrance(FOREST_TEMPLE_RED_POE_ROOM, {[]{return IsAdult || KokiriSword;}}), - Entrance(FOREST_TEMPLE_BLUE_POE_ROOM, {[]{return IsAdult || KokiriSword;}}), + Entrance(FOREST_TEMPLE_RED_POE_ROOM, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), + Entrance(FOREST_TEMPLE_BLUE_POE_ROOM, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), }); areaTable[FOREST_TEMPLE_BLUE_POE_ROOM] = Area("Forest Temple Blue Poe Room", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { @@ -261,8 +261,8 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_EAST_CORRIDOR] = Area("Forest Temple East Corridor", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(FOREST_TEMPLE_LOBBY, {[]{return IsAdult || CanChildAttack || Nuts;}}), - Entrance(FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return IsAdult || CanChildAttack || Nuts;}}), + Entrance(FOREST_TEMPLE_LOBBY, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}), + Entrance(FOREST_TEMPLE_GREEN_POE_ROOM, {[]{return CanAdultAttack || CanChildAttack || Nuts;}}), }); areaTable[FOREST_TEMPLE_BOSS_REGION] = Area("Forest Temple Boss Region", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -282,12 +282,12 @@ void AreaTable_Init_ForestTemple() { if (Dungeon::ForestTemple.IsMQ()) { areaTable[FOREST_TEMPLE_MQ_LOBBY] = Area("Forest Temple MQ Lobby", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, {[]{return IsAdult || Bombs || CanUse(STICKS) || Nuts || CanUse(BOOMERANG) || CanUse(DINS_FIRE) || KokiriSword || CanUse(SLINGSHOT);}}), + LocationAccess(FOREST_TEMPLE_MQ_FIRST_ROOM_CHEST, {[]{return CanJumpslash || Bombs || Nuts || HookshotOrBoomerang || CanUse(DINS_FIRE) || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(HOVER_BOOTS);}}), LocationAccess(FOREST_TEMPLE_MQ_GS_FIRST_HALLWAY, {[]{return HookshotOrBoomerang;}}), }, { //Exits Entrance(FOREST_TEMPLE_ENTRYWAY, {[]{return true;}}), - Entrance(FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return SmallKeys(FOREST_TEMPLE, 1) && (IsAdult || CanChildAttack || Nuts);}}), + Entrance(FOREST_TEMPLE_MQ_CENTRAL_AREA, {[]{return SmallKeys(FOREST_TEMPLE, 1) && (CanAdultAttack || CanChildAttack || Nuts);}}), }); areaTable[FOREST_TEMPLE_MQ_CENTRAL_AREA] = Area("Forest Temple MQ Central Area", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { @@ -295,12 +295,12 @@ void AreaTable_Init_ForestTemple() { EventAccess(&FairyPot, {[]{return true;}}), }, { //Locations - LocationAccess(FOREST_TEMPLE_MQ_WOLFOS_CHEST, {[]{return (CanPlay(SongOfTime) || IsChild) && (IsAdult || CanUse(DINS_FIRE) || CanUse(STICKS) || CanUse(SLINGSHOT) || KokiriSword);}}), - LocationAccess(FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {[]{return IsAdult || KokiriSword;}}), + LocationAccess(FOREST_TEMPLE_MQ_WOLFOS_CHEST, {[]{return (CanPlay(SongOfTime) || IsChild) && (CanJumpslash || CanUse(DINS_FIRE) || CanUse(SLINGSHOT));}}), + LocationAccess(FOREST_TEMPLE_MQ_GS_BLOCK_PUSH_ROOM, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), }, { //Exits - Entrance(FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}), - Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS, {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}), //This is as far as child can get + Entrance(FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return CanUse(BOW) || CanUse(SLINGSHOT);}}), + Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS, {[]{return CanUse(BOW) || CanUse(SLINGSHOT);}}), //This is as far as child can get Entrance(FOREST_TEMPLE_MQ_AFTER_BLOCK_PUZZLE, {[]{return IsAdult && (GoronBracelet || (LogicForestMQBlockPuzzle && HasBombchus && IsAdult && CanUse(HOOKSHOT)));}}), //Trick: IsAdult && (GoronBracelet || (LogicForestMQBlockPuzzle && HasBombchus && IsAdult && CanUse(HOOKSHOT))) Entrance(FOREST_TEMPLE_MQ_OUTDOOR_LEDGE, {[]{return (LogicForestMQHallwaySwitchJS && IsAdult && CanUse(HOVER_BOOTS)) || (LogicForestMQHallwaySwitchBoomerang && CanUse(BOOMERANG)) || (LogicForestMQHallwaySwitchHookshot && IsAdult && CanUse(HOOKSHOT));}}), @@ -321,7 +321,7 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_MQ_OUTDOOR_LEDGE] = Area("Forest Temple MQ Outdoor Ledge", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_MQ_REDEAD_CHEST, {[]{return true;}}), + LocationAccess(FOREST_TEMPLE_MQ_REDEAD_CHEST, {[]{return CanJumpslash;}}), }, { //Exits Entrance(FOREST_TEMPLE_MQ_NW_OUTDOORS, {[]{return true;}}), @@ -329,7 +329,7 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_MQ_NW_OUTDOORS] = Area("Forest Temple MQ NW Outdoors", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {[]{return true;}}), + LocationAccess(FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(FOREST_TEMPLE_MQ_NE_OUTDOORS, {[]{return (IsAdult && (CanUse(IRON_BOOTS) || CanUse(LONGSHOT) || (LogicForestMQWellSwim && CanUse(HOOKSHOT)))) || ProgressiveScale >= 2;}}), @@ -339,8 +339,8 @@ void AreaTable_Init_ForestTemple() { areaTable[FOREST_TEMPLE_MQ_NE_OUTDOORS] = Area("Forest Temple MQ NE Outdoors", "Forest Temple", FOREST_TEMPLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (IsAdult || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (IsAdult || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOOMERANG));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || HasExplosives || CanUse(DINS_FIRE));}}), }, { //Locations LocationAccess(FOREST_TEMPLE_MQ_WELL_CHEST, {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}), @@ -376,7 +376,7 @@ void AreaTable_Init_ForestTemple() { EventAccess(&ForestTempleJoAndBeth, {[]{return ForestTempleJoAndBeth || (IsAdult && CanUse(BOW));}}), }, { //Locations - LocationAccess(FOREST_TEMPLE_MQ_BOW_CHEST, {[]{return true;}}), + LocationAccess(FOREST_TEMPLE_MQ_BOW_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER);}}), LocationAccess(FOREST_TEMPLE_MQ_MAP_CHEST, {[]{return IsAdult && CanUse(BOW);}}), LocationAccess(FOREST_TEMPLE_MQ_COMPASS_CHEST, {[]{return IsAdult && CanUse(BOW);}}), }, { 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 ebb8625ec..007276ecb 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,7 +24,13 @@ void AreaTable_Init_GanonsCastle() { if (Dungeon::GanonsCastle.IsVanilla()) { areaTable[GANONS_CASTLE_LOBBY] = Area("Ganon's Castle Lobby", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return true;}}), + Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return true;}}), + Entrance(GANONS_CASTLE_MAIN, {[]{return true;}}), + }); + + areaTable[GANONS_CASTLE_MAIN] = Area("Ganon's Castle Main", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, { + //Exits + Entrance(GANONS_CASTLE_LOBBY, {[]{return true;}}), Entrance(GANONS_CASTLE_FOREST_TRIAL, {[]{return true;}}), Entrance(GANONS_CASTLE_FIRE_TRIAL, {[]{return true;}}), Entrance(GANONS_CASTLE_WATER_TRIAL, {[]{return true;}}), @@ -56,7 +62,7 @@ void AreaTable_Init_GanonsCastle() { EventAccess(&ForestTrialClear, {[]{return CanUse(LIGHT_ARROWS) && (FireArrows || DinsFire);}}), }, { //Locations - LocationAccess(GANONS_CASTLE_FOREST_TRIAL_CHEST, {[]{return IsAdult || CanChildDamage;}}), + LocationAccess(GANONS_CASTLE_FOREST_TRIAL_CHEST, {[]{return CanAdultDamage || CanChildDamage;}}), }, {}); areaTable[GANONS_CASTLE_FIRE_TRIAL] = Area("Ganon's Castle Fire Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { @@ -68,7 +74,7 @@ void AreaTable_Init_GanonsCastle() { //Events EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || HasBottle;}}), EventAccess(&FairyPot, {[]{return FairyPot || BlueFire;}}), - EventAccess(&WaterTrialClear, {[]{return BlueFire && Hammer && CanUse(LIGHT_ARROWS);}}), + EventAccess(&WaterTrialClear, {[]{return BlueFire && IsAdult && CanUse(MEGATON_HAMMER) && CanUse(LIGHT_ARROWS);}}), }, { //Locations LocationAccess(GANONS_CASTLE_WATER_TRIAL_LEFT_CHEST, {[]{return true;}}), @@ -77,7 +83,7 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_SHADOW_TRIAL] = Area("Ganon's Castle Shadow Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&ShadowTrialClear, {[]{return CanUse(LIGHT_ARROWS) && Hammer && ((FireArrows && (LogicLensCastle || CanUse(LENS_OF_TRUTH))) || (CanUse(LONGSHOT) && (CanUse(HOVER_BOOTS) || (DinsFire && (LogicLensCastle || CanUse(LENS_OF_TRUTH))))));}}), + EventAccess(&ShadowTrialClear, {[]{return CanUse(LIGHT_ARROWS) && CanUse(MEGATON_HAMMER) && ((FireArrows && (LogicLensCastle || CanUse(LENS_OF_TRUTH))) || (CanUse(LONGSHOT) && (CanUse(HOVER_BOOTS) || (DinsFire && (LogicLensCastle || CanUse(LENS_OF_TRUTH))))));}}), }, { //Locations LocationAccess(GANONS_CASTLE_SHADOW_TRIAL_FRONT_CHEST, {[]{return CanUse(FIRE_ARROWS) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || CanPlay(SongOfTime) || IsChild;}}), @@ -86,11 +92,11 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_SPIRIT_TRIAL] = Area("Ganon's Castle Spirit Trial", "Ganon's Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&NutPot, {[]{return NutPot || ((LogicSpiritTrialHookshot || CanUse(HOOKSHOT)) && HasBombchus && Bow && (MirrorShield || (SunlightArrows && CanUse(LIGHT_ARROWS))) && IsAdult);}}), - EventAccess(&SpiritTrialClear, {[]{return CanUse(LIGHT_ARROWS) && (MirrorShield || SunlightArrows) && HasBombchus && (LogicSpiritTrialHookshot || CanUse(HOOKSHOT));}}), + EventAccess(&NutPot, {[]{return NutPot || (((LogicSpiritTrialHookshot && CanJumpslash) || CanUse(HOOKSHOT)) && HasBombchus && CanUse(BOW) && (CanUse(MIRROR_SHIELD) || (SunlightArrows && CanUse(LIGHT_ARROWS))));}}), + EventAccess(&SpiritTrialClear, {[]{return CanUse(LIGHT_ARROWS) && (CanUse(MIRROR_SHIELD) || SunlightArrows) && HasBombchus && ((LogicSpiritTrialHookshot && CanJumpslash) || CanUse(HOOKSHOT));}}), }, { //Locations - LocationAccess(GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return LogicSpiritTrialHookshot || CanUse(HOOKSHOT);}}), + LocationAccess(GANONS_CASTLE_SPIRIT_TRIAL_CRYSTAL_SWITCH_CHEST, {[]{return (LogicSpiritTrialHookshot || CanUse(HOOKSHOT)) && CanJumpslash;}}), LocationAccess(GANONS_CASTLE_SPIRIT_TRIAL_INVISIBLE_CHEST, {[]{return (LogicSpiritTrialHookshot || CanUse(HOOKSHOT)) && HasBombchus && (LogicLensCastle || CanUse(LENS_OF_TRUTH));}}), }, {}); @@ -112,9 +118,9 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_TOWER] = Area("Ganon's Castle Tower", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GANONS_TOWER_BOSS_KEY_CHEST, {[]{return true;}}), - LocationAccess(GANONDORF_HINT, {[]{return BossKeyGanonsCastle;}}), - LocationAccess(GANON, {[]{return BossKeyGanonsCastle && CanUse(LIGHT_ARROWS);}}), + LocationAccess(GANONS_TOWER_BOSS_KEY_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(GANONDORF_HINT, {[]{return BossKeyGanonsCastle && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD));}}), + LocationAccess(GANON, {[]{return BossKeyGanonsCastle && CanUse(LIGHT_ARROWS) && CanUse(MASTER_SWORD);}}), }, {}); /*--------------------------- @@ -123,7 +129,13 @@ void AreaTable_Init_GanonsCastle() { if (Dungeon::GanonsCastle.IsMQ()) { areaTable[GANONS_CASTLE_MQ_LOBBY] = Area("Ganon's Castle MQ Lobby", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits - Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return (IsAdult || (HasExplosives || ((Nuts || Boomerang) && (Sticks || KokiriSword))));}}), + Entrance(GANONS_CASTLE_ENTRYWAY, {[]{return true;}}), + Entrance(GANONS_CASTLE_MQ_MAIN, {[]{return (CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER)) || ((HasExplosives || Nuts || CanUse(BOOMERANG)) && CanJumpslash);}}), + }); + + areaTable[GANONS_CASTLE_MQ_MAIN] = Area("Ganon's Castle MQ Main", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, {}, {}, { + //Exits + Entrance(GANONS_CASTLE_MQ_LOBBY, {[]{return true;}}), Entrance(GANONS_CASTLE_MQ_FOREST_TRIAL, {[]{return true;}}), Entrance(GANONS_CASTLE_MQ_FIRE_TRIAL, {[]{return true;}}), Entrance(GANONS_CASTLE_MQ_WATER_TRIAL, {[]{return true;}}), @@ -153,12 +165,12 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_MQ_FOREST_TRIAL] = Area("Ganon's Castle MQ Forest Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&ForestTrialClear, {[]{return IsAdult && CanUse(LIGHT_ARROWS) && CanPlay(SongOfTime);}}), + EventAccess(&ForestTrialClear, {[]{return IsAdult && CanUse(LIGHT_ARROWS) && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && CanPlay(SongOfTime);}}), }, { //Locations - LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST, {[]{return (IsAdult && CanUse(BOW)) || (IsChild && CanUse(SLINGSHOT));}}), - LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, {[]{return HasFireSource;}}), - LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY, {[]{return HookshotOrBoomerang;}}), + LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_EYE_SWITCH_CHEST, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (CanUse(BOW) || CanUse(SLINGSHOT));}}), + LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_FROZEN_EYE_SWITCH_CHEST, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && HasFireSource;}}), + LocationAccess(GANONS_CASTLE_MQ_FOREST_TRIAL_FREESTANDING_KEY, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && HookshotOrBoomerang;}}), }, {}); areaTable[GANONS_CASTLE_MQ_FIRE_TRIAL] = Area("Ganon's Castle MQ Fire Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { @@ -170,10 +182,10 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_MQ_WATER_TRIAL] = Area("Ganon's Castle MQ Water Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { //Events EventAccess(&WaterTrialClear, {[]{return BlueFire && IsAdult && CanUse(LIGHT_ARROWS) && SmallKeys(GANONS_CASTLE, 3);}}), - EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || HasBottle;}}), + EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || (HasBottle && CanJumpslash);}}), }, { //Locations - LocationAccess(GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, {[]{return BlueFire && (IsAdult || CanUse(STICKS) || KokiriSword || CanUseProjectile);}}), + LocationAccess(GANONS_CASTLE_MQ_WATER_TRIAL_CHEST, {[]{return BlueFire;}}), }, {}); areaTable[GANONS_CASTLE_MQ_SHADOW_TRIAL] = Area("Ganon's Castle MQ Shadow Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { @@ -203,11 +215,11 @@ void AreaTable_Init_GanonsCastle() { areaTable[GANONS_CASTLE_MQ_LIGHT_TRIAL] = Area("Ganon's Castle MQ Light Trial", "Ganons Castle", GANONS_CASTLE, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&LightTrialClear, {[]{return IsAdult && CanUse(LIGHT_ARROWS) && SmallKeys(GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ);}}), + EventAccess(&LightTrialClear, {[]{return IsAdult && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD)) && CanUse(LIGHT_ARROWS) && SmallKeys(GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ);}}), //Trick: IsAdult && CanUse(LIGHT_ARROWS) && SmallKeys(GANONS_CASTLE, 3) && (LogicLensCastleMQ || CanUse(LENS_OF_TRUTH)) && (Hookshot || LogicLightTrialMQ) }, { //Locations - LocationAccess(GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, {[]{return CanPlay(ZeldasLullaby);}}), + LocationAccess(GANONS_CASTLE_MQ_LIGHT_TRIAL_LULLABY_CHEST, {[]{return (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD)) && CanPlay(ZeldasLullaby);}}), }, {}); } } diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp index 77cf0a4e2..15a9e4e64 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp @@ -25,13 +25,13 @@ void AreaTable_Init_GerudoTrainingGrounds() { //Locations LocationAccess(GERUDO_TRAINING_GROUNDS_LOBBY_LEFT_CHEST, {[]{return CanUse(BOW) || CanUse(SLINGSHOT);}}), LocationAccess(GERUDO_TRAINING_GROUNDS_LOBBY_RIGHT_CHEST, {[]{return CanUse(BOW) || CanUse(SLINGSHOT);}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_STALFOS_CHEST, {[]{return IsAdult || KokiriSword;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST, {[]{return HasExplosives && (IsAdult || KokiriSword);}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_STALFOS_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_BEAMOS_CHEST, {[]{return HasExplosives && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD));}}), }, { //Exits Entrance(GERUDO_TRAINING_GROUNDS_ENTRYWAY, {[]{return true;}}), - Entrance(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (IsAdult || KokiriSword) && (CanUse(HOOKSHOT) || LogicGtgWithoutHookshot);}}), - Entrance(GERUDO_TRAINING_GROUNDS_LAVA_ROOM, {[]{return Here(GERUDO_TRAINING_GROUNDS_LOBBY, []{return (IsAdult || KokiriSword) && HasExplosives;});}}), + Entrance(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (CanUse(HOOKSHOT) || LogicGtgWithoutHookshot);}}), + Entrance(GERUDO_TRAINING_GROUNDS_LAVA_ROOM, {[]{return Here(GERUDO_TRAINING_GROUNDS_LOBBY, []{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && HasExplosives;});}}), Entrance(GERUDO_TRAINING_GROUNDS_CENTRAL_MAZE, {[]{return true;}}), }); @@ -69,11 +69,11 @@ void AreaTable_Init_GerudoTrainingGrounds() { areaTable[GERUDO_TRAINING_GROUNDS_HAMMER_ROOM] = Area("Gerudo Training Grounds Hammer Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST, {[]{return true;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_CLEAR_CHEST, {[]{return CanAdultAttack || CanChildAttack;}}), LocationAccess(GERUDO_TRAINING_GROUNDS_HAMMER_ROOM_SWITCH_CHEST, {[]{return CanUse(MEGATON_HAMMER) || (CanTakeDamage && LogicFlamingChests);}}), }, { //Exits - Entrance(GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return CanUse(MEGATON_HAMMER) && Bow;}}), + Entrance(GERUDO_TRAINING_GROUNDS_EYE_STATUE_LOWER, {[]{return CanUse(MEGATON_HAMMER) && CanUse(BOW);}}), Entrance(GERUDO_TRAINING_GROUNDS_LAVA_ROOM, {[]{return true;}}), }); @@ -95,7 +95,7 @@ void AreaTable_Init_GerudoTrainingGrounds() { areaTable[GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_ROOM] = Area("Gerudo Training Grounds Heavy Block Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST, {[]{return true;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_BEFORE_HEAVY_BLOCK_CHEST, {[]{return CanJumpslash;}}), }, { //Exits Entrance(GERUDO_TRAINING_GROUNDS_EYE_STATUE_UPPER, {[]{return (LogicLensGtg || CanUse(LENS_OF_TRUTH)) && (CanUse(HOOKSHOT) || (LogicGtgFakeWall && CanUse(HOVER_BOOTS)));}}), @@ -104,10 +104,10 @@ void AreaTable_Init_GerudoTrainingGrounds() { areaTable[GERUDO_TRAINING_GROUNDS_LIKE_LIKE_ROOM] = Area("Gerudo Training Grounds Like Like Room", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST, {[]{return true;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST, {[]{return true;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST, {[]{return true;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST, {[]{return true;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FIRST_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_SECOND_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_THIRD_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_HEAVY_BLOCK_FOURTH_CHEST, {[]{return CanJumpslash;}}), }, {}); } @@ -135,10 +135,10 @@ void AreaTable_Init_GerudoTrainingGrounds() { //EventAccess(&WallFairy, {[]{return WallFairy || (IsAdult && CanUse(BOW));}}), }, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST, {[]{return IsAdult;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_DINOLFOS_CHEST, {[]{return IsAdult && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD));}}), }, { //Exits - Entrance(GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (Bow || CanUse(LONGSHOT)) && CanUse(HOVER_BOOTS) && IsAdult;}}), + Entrance(GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER, {[]{return (Bow || (CanUse(LONGSHOT) && HasFireSource)) && CanUse(HOVER_BOOTS) && IsAdult && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD));}}), }); areaTable[GERUDO_TRAINING_GROUNDS_MQ_UNDERWATER] = Area("Gerudo Training Grounds MQ Underwater", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { @@ -148,7 +148,7 @@ void AreaTable_Init_GerudoTrainingGrounds() { areaTable[GERUDO_TRAINING_GROUNDS_MQ_LEFT_SIDE] = Area("Gerudo Training Grounds MQ Left Side", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST, {[]{return IsAdult || KokiriSword || HasExplosives;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_FIRST_IRON_KNUCKLE_CHEST, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || HasExplosives;}}), }, { //Exits Entrance(GERUDO_TRAINING_GROUNDS_MQ_STALFOS_ROOM, {[]{return (IsAdult && CanUse(LONGSHOT)) || LogicGtgMQWithoutHookshot || (LogicGtgMQWithHookshot && IsAdult && CanUse(HOOKSHOT));}}), @@ -160,8 +160,8 @@ void AreaTable_Init_GerudoTrainingGrounds() { EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || HasBottle;}}), }, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST, {[]{return IsAdult;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST, {[]{return CanUse(SILVER_GAUNTLETS);}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_BEFORE_HEAVY_BLOCK_CHEST, {[]{return IsAdult && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD));}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_HEAVY_BLOCK_CHEST, {[]{return CanUse(SILVER_GAUNTLETS) && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD));}}), }, { //Exits Entrance(GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS, {[]{return IsAdult && (LogicLensGtgMQ || CanUse(LENS_OF_TRUTH)) && BlueFire && (CanPlay(SongOfTime) || (LogicGtgFakeWall && IsAdult && CanUse(HOVER_BOOTS)));}}), @@ -170,12 +170,12 @@ void AreaTable_Init_GerudoTrainingGrounds() { areaTable[GERUDO_TRAINING_GROUNDS_MQ_BACK_AREAS] = Area("Gerudo Training Grounds MQ Back Areas", "Gerudo Training Grounds", GERUDO_TRAINING_GROUNDS, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST, {[]{return Bow;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST, {[]{return true;}}), - LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST, {[]{return CanUse(HOOKSHOT) || Bow || HasExplosives;}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_EYE_STATUE_CHEST, {[]{return CanUse(BOW);}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_SECOND_IRON_KNUCKLE_CHEST, {[]{return (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD));}}), + LocationAccess(GERUDO_TRAINING_GROUNDS_MQ_FLAME_CIRCLE_CHEST, {[]{return CanUse(HOOKSHOT) || CanUse(BOW) || HasExplosives;}}), }, { //Exits - Entrance(GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, {[]{return Hammer;}}), + Entrance(GERUDO_TRAINING_GROUNDS_MQ_CENTRAL_MAZE_RIGHT, {[]{return CanUse(MEGATON_HAMMER);}}), Entrance(GERUDO_TRAINING_GROUNDS_MQ_RIGHT_SIDE, {[]{return CanUse(LONGSHOT);}}), }); diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp index 70fd1f22b..f11a74f3c 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_valley.cpp @@ -104,13 +104,13 @@ void AreaTable_Init_GerudoValley() { LocationAccess(GF_CHEST, {[]{return CanUse(HOVER_BOOTS) || (IsAdult && CanUse(SCARECROW)) || CanUse(LONGSHOT);}}), LocationAccess(GF_HBA_1000_POINTS, {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}), LocationAccess(GF_HBA_1500_POINTS, {[]{return GerudoToken && CanRideEpona && Bow && AtDay;}}), - LocationAccess(GF_NORTH_F1_CARPENTER, {[]{return IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), - LocationAccess(GF_NORTH_F2_CARPENTER, {[]{return (IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen);}}), - LocationAccess(GF_SOUTH_F1_CARPENTER, {[]{return IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), - LocationAccess(GF_SOUTH_F2_CARPENTER, {[]{return IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(GF_NORTH_F1_CARPENTER, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(GF_NORTH_F2_CARPENTER, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen);}}), + LocationAccess(GF_SOUTH_F1_CARPENTER, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(GF_SOUTH_F2_CARPENTER, {[]{return CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), LocationAccess(GF_GERUDO_MEMBERSHIP_CARD, {[]{return CanFinishGerudoFortress;}}), LocationAccess(GF_GS_ARCHERY_RANGE, {[]{return IsAdult && HookshotOrBoomerang && GerudoToken && AtNight && CanGetNightTimeGS;}}), - LocationAccess(GF_GS_TOP_FLOOR, {[]{return IsAdult && AtNight && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen || LogicGFJump) && CanGetNightTimeGS;}}), + LocationAccess(GF_GS_TOP_FLOOR, {[]{return IsAdult && AtNight && (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOOMERANG) || HasExplosives || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(DINS_FIRE)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen || LogicGFJump) && CanGetNightTimeGS;}}), }, { //Exits Entrance(GV_FORTRESS_SIDE, {[]{return true;}}), @@ -119,7 +119,7 @@ void AreaTable_Init_GerudoValley() { Entrance(GF_STORMS_GROTTO, {[]{return IsAdult && CanOpenStormGrotto;}}), }); - areaTable[GF_OUTSIDE_GATE] = Area("GF Outside Gate", "Gerudo Fortress", NONE, NO_DAY_NIGHT_CYCLE, { + areaTable[GF_OUTSIDE_GATE] = Area("GF Outside Gate", "Gerudo Fortress", GERUDO_FORTRESS, NO_DAY_NIGHT_CYCLE, { //Events EventAccess(&GF_GateOpen, {[]{return IsAdult && GerudoToken && (ShuffleGerudoToken || ShuffleOverworldEntrances /*|| ShuffleSpecialIndoorEntrances*/);}}), }, {}, { @@ -149,7 +149,7 @@ void AreaTable_Init_GerudoValley() { }, { //Locations LocationAccess(WASTELAND_CHEST, {[]{return HasFireSource;}}), - LocationAccess(WASTELAND_BOMBCHU_SALESMAN, {[]{return AdultsWallet && (IsAdult || Sticks || KokiriSword);}}), + LocationAccess(WASTELAND_BOMBCHU_SALESMAN, {[]{return AdultsWallet && (CanJumpslash || CanUse(HOVER_BOOTS)) ;}}), LocationAccess(WASTELAND_GS, {[]{return HookshotOrBoomerang;}}), }, { //Exits @@ -157,7 +157,7 @@ void AreaTable_Init_GerudoValley() { Entrance(WASTELAND_NEAR_FORTRESS, {[]{return CanUse(HOVER_BOOTS) || CanUse(LONGSHOT) || LogicWastelandCrossing;}}), }); - areaTable[WASTELAND_NEAR_COLOSSUS] = Area("Wasteland Near Colossus", "Haunted Wasteland", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[WASTELAND_NEAR_COLOSSUS] = Area("Wasteland Near Colossus", "Haunted Wasteland", HAUNTED_WASTELAND, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(DESERT_COLOSSUS, {[]{return true;}}), Entrance(HAUNTED_WASTELAND, {[]{return LogicReverseWasteland || false;}}), @@ -172,7 +172,7 @@ void AreaTable_Init_GerudoValley() { LocationAccess(COLOSSUS_FREESTANDING_POH, {[]{return IsAdult && CanPlantBean(DESERT_COLOSSUS);}}), LocationAccess(COLOSSUS_GS_BEAN_PATCH, {[]{return CanPlantBugs && CanChildAttack;}}), LocationAccess(COLOSSUS_GS_TREE, {[]{return IsAdult && HookshotOrBoomerang && AtNight && CanGetNightTimeGS;}}), - LocationAccess(COLOSSUS_GS_HILL, {[]{return IsAdult && AtNight && (CanPlantBean(DESERT_COLOSSUS) || CanUse(LONGSHOT) || (LogicColossusGS && CanUse(HOOKSHOT))) && CanGetNightTimeGS;}}), + LocationAccess(COLOSSUS_GS_HILL, {[]{return IsAdult && AtNight && ((CanPlantBean(DESERT_COLOSSUS) && CanAdultAttack) || CanUse(LONGSHOT) || (LogicColossusGS && CanUse(HOOKSHOT))) && CanGetNightTimeGS;}}), LocationAccess(COLOSSUS_GOSSIP_STONE, {[]{return true;}}), }, { //Exits diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp index 7b247049d..5b3e34a4b 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_hyrule_field.cpp @@ -115,7 +115,7 @@ void AreaTable_Init_HyruleField() { LocationAccess(LH_SUN, {[]{return IsAdult && WaterTempleClear && CanUse(BOW);}}), LocationAccess(LH_FREESTANDING_POH, {[]{return IsAdult && (CanUse(SCARECROW) || CanPlantBean(LAKE_HYLIA));}}), LocationAccess(LH_GS_BEAN_PATCH, {[]{return CanPlantBugs && CanChildAttack;}}), - LocationAccess(LH_GS_LAB_WALL, {[]{return IsChild && (HookshotOrBoomerang || (LogicLabWallGS && (Sticks || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)))) && AtNight && CanGetNightTimeGS;}}), + LocationAccess(LH_GS_LAB_WALL, {[]{return IsChild && (HookshotOrBoomerang || (LogicLabWallGS && CanJumpslash)) && AtNight && CanGetNightTimeGS;}}), LocationAccess(LH_GS_SMALL_ISLAND, {[]{return IsChild && CanChildAttack && AtNight && CanGetNightTimeGS;}}), LocationAccess(LH_GS_TREE, {[]{return IsAdult && CanUse(LONGSHOT) && AtNight && CanGetNightTimeGS;}}), LocationAccess(LH_LAB_GOSSIP_STONE, {[]{return true;}}), @@ -138,7 +138,7 @@ void AreaTable_Init_HyruleField() { Entrance(LH_FISHING_HOLE, {[]{return true;}}), }); - areaTable[LH_OWL_FLIGHT] = Area("LH Owl Flight", "Lake Hylia", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[LH_OWL_FLIGHT] = Area("LH Owl Flight", "Lake Hylia", LAKE_HYLIA, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(HYRULE_FIELD, {[]{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 f5efcc3c8..a7f74f83c 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 @@ -24,7 +24,7 @@ void AreaTable_Init_IceCavern() { areaTable[ICE_CAVERN_BEGINNING] = Area("Ice Cavern Beginning", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(ICE_CAVERN_ENTRYWAY, {[]{return true;}}), - Entrance(ICE_CAVERN_MAIN, {[]{return Here(ICE_CAVERN_BEGINNING, []{return IsAdult || HasExplosives || CanUse(DINS_FIRE);});}}), + Entrance(ICE_CAVERN_MAIN, {[]{return Here(ICE_CAVERN_BEGINNING, []{return (CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) || CanUse(RG_MEGATON_HAMMER) || HasExplosives || CanUse(HOOKSHOT) || CanUse(DINS_FIRE);});}}), }); areaTable[ICE_CAVERN_MAIN] = Area("Ice Cavern", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, { @@ -34,8 +34,8 @@ void AreaTable_Init_IceCavern() { //Locations LocationAccess(ICE_CAVERN_MAP_CHEST, {[]{return BlueFire && IsAdult;}}), LocationAccess(ICE_CAVERN_COMPASS_CHEST, {[]{return BlueFire;}}), - LocationAccess(ICE_CAVERN_IRON_BOOTS_CHEST, {[]{return BlueFire && (IsAdult || Slingshot || Sticks || KokiriSword || CanUse(DINS_FIRE));}}), - LocationAccess(SHEIK_IN_ICE_CAVERN, {[]{return BlueFire && IsAdult;}}), + LocationAccess(ICE_CAVERN_IRON_BOOTS_CHEST, {[]{return BlueFire && (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || CanUse(DINS_FIRE));}}), + LocationAccess(SHEIK_IN_ICE_CAVERN, {[]{return BlueFire && (CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(MEGATON_HAMMER) || CanUse(DINS_FIRE)) && IsAdult;}}), LocationAccess(ICE_CAVERN_FREESTANDING_POH, {[]{return BlueFire;}}), LocationAccess(ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, {[]{return HookshotOrBoomerang;}}), LocationAccess(ICE_CAVERN_GS_HEART_PIECE_ROOM, {[]{return BlueFire && HookshotOrBoomerang;}}), @@ -53,25 +53,25 @@ void AreaTable_Init_IceCavern() { }, {}, { //Exits Entrance(ICE_CAVERN_ENTRYWAY, {[]{return true;}}), - Entrance(ICE_CAVERN_MQ_MAP_ROOM, {[]{return IsAdult || CanUse(DINS_FIRE) || (HasExplosives && (CanUse(STICKS) || CanUse(SLINGSHOT) || KokiriSword));}}), + Entrance(ICE_CAVERN_MQ_MAP_ROOM, {[]{return CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(DINS_FIRE) || (HasExplosives && (CanUse(KOKIRI_SWORD) || CanUse(STICKS) || CanUse(SLINGSHOT) || CanUse(BOW)));}}), Entrance(ICE_CAVERN_MQ_COMPASS_ROOM, {[]{return IsAdult && BlueFire;}}), Entrance(ICE_CAVERN_MQ_IRON_BOOTS_REGION, {[]{return BlueFire;}}), }); areaTable[ICE_CAVERN_MQ_MAP_ROOM] = Area("Ice Cavern MQ Map Room", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || HasBottle;}}), + EventAccess(&BlueFireAccess, {[]{return BlueFireAccess || (HasBottle && CanJumpslash);}}), }, { //Locations - LocationAccess(ICE_CAVERN_MQ_MAP_CHEST, {[]{return BlueFire && (IsAdult || CanUse(STICKS) || KokiriSword || CanUseProjectile);}}), + LocationAccess(ICE_CAVERN_MQ_MAP_CHEST, {[]{return BlueFire && (CanJumpslash || HasExplosives || CanUseProjectile);}}), }, {}); areaTable[ICE_CAVERN_MQ_IRON_BOOTS_REGION] = Area("Ice Cavern MQ Iron Boots Region", "Ice Cavern", ICE_CAVERN, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return IsAdult;}}), - LocationAccess(SHEIK_IN_ICE_CAVERN, {[]{return IsAdult;}}), - LocationAccess(ICE_CAVERN_MQ_GS_ICE_BLOCK, {[]{return IsAdult || CanUseProjectile;}}), - LocationAccess(ICE_CAVERN_MQ_GS_SCARECROW, {[]{return (CanUse(SCARECROW) || (HoverBoots && CanUse(LONGSHOT)) || LogicIceMQScarecrow) && IsAdult;}}), + LocationAccess(ICE_CAVERN_MQ_IRON_BOOTS_CHEST, {[]{return IsAdult && (CanJumpslash || CanUse(RG_MEGATON_HAMMER));}}), + LocationAccess(SHEIK_IN_ICE_CAVERN, {[]{return IsAdult && (CanJumpslash || CanUse(RG_MEGATON_HAMMER));}}), + LocationAccess(ICE_CAVERN_MQ_GS_ICE_BLOCK, {[]{return CanAdultAttack || CanChildAttack;}}), + LocationAccess(ICE_CAVERN_MQ_GS_SCARECROW, {[]{return CanUse(SCARECROW) || (HoverBoots && CanUse(LONGSHOT)) || (LogicIceMQScarecrow && IsAdult);}}), //Tricks: (CanUse(SCARECROW) || (HoverBoots && CanUse(LONGSHOT)) || LogicIceMQScarecrow) && IsAdult }, {}); diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp index d7b48d7f1..108b69ccc 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_jabujabus_belly.cpp @@ -111,7 +111,7 @@ void AreaTable_Init_JabuJabusBelly() { areaTable[JABU_JABUS_BELLY_COMPASS_ROOM] = Area("Jabu Jabus Belly Compass Room", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(JABU_JABUS_BELLY_COMPASS_CHEST, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(JABU_JABUS_BELLY_COMPASS_CHEST, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(JABU_JABUS_BELLY_FORKED_CORRIDOR, {[]{return true;}}), @@ -150,7 +150,7 @@ void AreaTable_Init_JabuJabusBelly() { areaTable[JABU_JABUS_BELLY_NEAR_BOSS_ROOM] = Area("Jabu Jabus Belly Near Boss Room", "Jabu Jabus Belly", JABU_JABUS_BELLY, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(JABU_JABUS_BELLY_GS_NEAR_BOSS, {[]{return IsAdult || CanChildAttack;}}), + LocationAccess(JABU_JABUS_BELLY_GS_NEAR_BOSS, {[]{return CanAdultAttack || CanChildAttack;}}), }, { //Exits Entrance(JABU_JABUS_BELLY_LIFT_MIDDLE, {[]{return true;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp index db9bb69dc..5660104f7 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_kakariko.cpp @@ -184,7 +184,7 @@ void AreaTable_Init_Kakariko() { areaTable[KAK_REDEAD_GROTTO] = Area("Kak Redead Grotto", "Kak Redead Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(KAK_REDEAD_GROTTO_CHEST, {[]{return IsAdult || (Sticks || KokiriSword || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD));}}), + LocationAccess(KAK_REDEAD_GROTTO_CHEST, {[]{return CanUse(STICKS) || CanUse(KOKIRI_SWORD) || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), }, { //Exits Entrance(KAKARIKO_VILLAGE, {[]{return true;}}), @@ -241,7 +241,7 @@ void AreaTable_Init_Kakariko() { areaTable[GRAVEYARD_COMPOSERS_GRAVE] = Area("Graveyard Composers Grave", "Graveyard Composers Grave", NONE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(GRAVEYARD_COMPOSERS_GRAVE_CHEST, {[]{return HasFireSource;}}), - LocationAccess(SONG_FROM_COMPOSERS_GRAVE, {[]{return IsAdult || (Slingshot || Boomerang || Sticks || HasExplosives || KokiriSword || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(BOW) || CanUse(HOOKSHOT));}}), + LocationAccess(SONG_FROM_COMPOSERS_GRAVE, {[]{return CanUseProjectile || CanJumpslash || CanUse(MEGATON_HAMMER);}}), }, { //Exits Entrance(THE_GRAVEYARD, {[]{return true;}}), @@ -278,7 +278,7 @@ void AreaTable_Init_Kakariko() { Entrance(SHADOW_TEMPLE_ENTRYWAY, {[]{return CanUse(DINS_FIRE) || (LogicShadowFireArrowEntry && IsAdult && CanUse(FIRE_ARROWS));}}), }); - areaTable[KAK_BEHIND_GATE] = Area("Kak Behind Gate", "Kakariko Village", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[KAK_BEHIND_GATE] = Area("Kak Behind Gate", "Kakariko Village", KAKARIKO_VILLAGE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(KAKARIKO_VILLAGE, {[]{return IsAdult || LogicVisibleCollision || KakarikoVillageGateOpen || OpenKakariko.Is(OPENKAKARIKO_OPEN);}}), Entrance(DEATH_MOUNTAIN_TRAIL, {[]{return true;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp index 1ba2048a0..27d3cecbe 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp @@ -34,8 +34,8 @@ void AreaTable_Init_LostWoods() { areaTable[KF_OUTSIDE_DEKU_TREE] = Area("KF Outside Deku Tree", "Kokiri Forest", KOKIRI_FOREST, NO_DAY_NIGHT_CYCLE, { //Events - EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || ((IsAdult && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF)) || KokiriSword || Boomerang);}}), - EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || ((IsAdult && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF)) || KokiriSword || Slingshot || Sticks || HasExplosives || CanUse(DINS_FIRE));}}), + EventAccess(&DekuBabaSticks, {[]{return DekuBabaSticks || ((IsAdult && (CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(KOKIRI_SWORD)) && !ShuffleEntrances) || (IsChild && (CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(MASTER_SWORD) || CanUse(BOOMERANG))));}}), + EventAccess(&DekuBabaNuts, {[]{return DekuBabaNuts || ((IsAdult && (CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD) || CanUse(KOKIRI_SWORD)) && !ShuffleEntrances) || (IsChild && (CanJumpslash || CanUse(SLINGSHOT) || HasExplosives || CanUse(DINS_FIRE))));}}), EventAccess(&ShowedMidoSwordAndShield, {[]{return ShowedMidoSwordAndShield || (IsChild && KokiriSword && DekuShield);}}), }, { //Locations @@ -105,7 +105,7 @@ void AreaTable_Init_LostWoods() { Entrance(KOKIRI_FOREST, {[]{return true;}}) }); - areaTable[LW_FOREST_EXIT] = Area("LW Forest Exit", "Lost Woods", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[LW_FOREST_EXIT] = Area("LW Forest Exit", "Lost Woods", THE_LOST_WOODS, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(KOKIRI_FOREST, {[]{return true;}}) }); @@ -144,7 +144,7 @@ void AreaTable_Init_LostWoods() { //Locations LocationAccess(LW_DEKU_SCRUB_NEAR_DEKU_THEATER_RIGHT, {[]{return IsChild && CanStunDeku;}}), LocationAccess(LW_DEKU_SCRUB_NEAR_DEKU_THEATER_LEFT, {[]{return IsChild && CanStunDeku;}}), - LocationAccess(LW_GS_ABOVE_THEATER, {[]{return IsAdult && AtNight && (CanPlantBean(LW_BEYOND_MIDO) || (LogicLostWoodsGSBean && CanUse(HOOKSHOT) && (CanUse(LONGSHOT) || CanUse(BOW) || CanUse(SLINGSHOT) || HasBombchus || CanUse(DINS_FIRE)))) && CanGetNightTimeGS;}}), + LocationAccess(LW_GS_ABOVE_THEATER, {[]{return IsAdult && AtNight && ((CanPlantBean(LW_BEYOND_MIDO) && CanAdultAttack) || (LogicLostWoodsGSBean && CanUse(HOOKSHOT) && (CanUse(LONGSHOT) || CanUse(BOW) || CanUse(SLINGSHOT) || HasBombchus || CanUse(DINS_FIRE)))) && CanGetNightTimeGS;}}), LocationAccess(LW_GS_BEAN_PATCH_NEAR_THEATER, {[]{return CanPlantBugs && (CanChildAttack || (Scrubsanity.Is(SCRUBSANITY_OFF) && DekuShield));}}), }, { //Exits @@ -185,7 +185,7 @@ void AreaTable_Init_LostWoods() { areaTable[SFM_ENTRYWAY] = Area("SFM Entryway", "Sacred Forest Meadow", SACRED_FOREST_MEADOW, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(LW_BEYOND_MIDO, {[]{return true;}}), - Entrance(SACRED_FOREST_MEADOW, {[]{return IsAdult || Slingshot || Sticks || KokiriSword || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + Entrance(SACRED_FOREST_MEADOW, {[]{return IsAdult || CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER);}}), Entrance(SFM_WOLFOS_GROTTO, {[]{return CanOpenBombGrotto;}}), }); @@ -218,7 +218,7 @@ void AreaTable_Init_LostWoods() { areaTable[SFM_WOLFOS_GROTTO] = Area("SFM Wolfos Grotto", "SFM Wolfos Grotto", NONE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(SFM_WOLFOS_GROTTO_CHEST, {[]{return IsAdult || Slingshot || Sticks || KokiriSword || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD);}}), + LocationAccess(SFM_WOLFOS_GROTTO_CHEST, {[]{return CanJumpslash || CanUse(SLINGSHOT) || CanUse(BOW) || CanUse(DINS_FIRE) || CanUse(MEGATON_HAMMER);}}), }, { //Exits Entrance(SFM_ENTRYWAY, {[]{return true;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp index 5296a6398..a3dda7521 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_shadow_temple.cpp @@ -26,12 +26,12 @@ void AreaTable_Init_ShadowTemple() { EventAccess(&NutPot, {[]{return true;}}), }, { //Locations - LocationAccess(SHADOW_TEMPLE_MAP_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_HOVER_BOOTS_CHEST, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_MAP_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(SHADOW_TEMPLE_HOVER_BOOTS_CHEST, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD));}}), }, { //Exits Entrance(SHADOW_TEMPLE_ENTRYWAY, {[]{return true;}}), - Entrance(SHADOW_TEMPLE_FIRST_BEAMOS, {[]{return HoverBoots;}}), + Entrance(SHADOW_TEMPLE_FIRST_BEAMOS, {[]{return CanUse(HOVER_BOOTS);}}), }); areaTable[SHADOW_TEMPLE_FIRST_BEAMOS] = Area("Shadow Temple First Beamos", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, { @@ -39,7 +39,7 @@ void AreaTable_Init_ShadowTemple() { EventAccess(&FairyPot, {[]{return true;}}), //This fairy pot is only on 3DS }, { //Locations - LocationAccess(SHADOW_TEMPLE_COMPASS_CHEST, {[]{return IsAdult || KokiriSword || Sticks;}}), + LocationAccess(SHADOW_TEMPLE_COMPASS_CHEST, {[]{return CanJumpslash;}}), LocationAccess(SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, {[]{return CanUse(HOVER_BOOTS) || CanUse(HOOKSHOT);}}), LocationAccess(SHADOW_TEMPLE_GS_NEAR_SHIP, {[]{return false;}}), }, { @@ -50,14 +50,14 @@ void AreaTable_Init_ShadowTemple() { areaTable[SHADOW_TEMPLE_HUGE_PIT] = Area("Shadow Temple Huge Pit", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_INVISIBLE_BLADES_VISIBLE_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(SHADOW_TEMPLE_INVISIBLE_BLADES_INVISIBLE_CHEST, {[]{return CanJumpslash;}}), LocationAccess(SHADOW_TEMPLE_FALLING_SPIKES_LOWER_CHEST, {[]{return true;}}), LocationAccess(SHADOW_TEMPLE_FALLING_SPIKES_UPPER_CHEST, {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}), LocationAccess(SHADOW_TEMPLE_FALLING_SPIKES_SWITCH_CHEST, {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}), LocationAccess(SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST, {[]{return SmallKeys(SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(LENS_OF_TRUTH));}}), LocationAccess(SHADOW_TEMPLE_FREESTANDING_KEY, {[]{return SmallKeys(SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(LENS_OF_TRUTH)) && Hookshot && (Bombs || GoronBracelet || (LogicShadowFreestandingKey && HasBombchus));}}), - LocationAccess(SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM, {[]{return CanJumpslash;}}), LocationAccess(SHADOW_TEMPLE_GS_FALLING_SPIKES_ROOM, {[]{return Hookshot || (LogicShadowUmbrellaGS && HoverBoots);}}), LocationAccess(SHADOW_TEMPLE_GS_SINGLE_GIANT_POT, {[]{return SmallKeys(SHADOW_TEMPLE, 2, 3) && ((LogicLensShadowPlatform && LogicLensShadow) || CanUse(LENS_OF_TRUTH)) && Hookshot;}}), }, { @@ -68,20 +68,20 @@ void AreaTable_Init_ShadowTemple() { areaTable[SHADOW_TEMPLE_WIND_TUNNEL] = Area("Shadow Temple Wind Tunnel", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(SHADOW_TEMPLE_WIND_HINT_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_AFTER_WIND_ENEMY_CHEST, {[]{return CanJumpslash;}}), LocationAccess(SHADOW_TEMPLE_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}), LocationAccess(SHADOW_TEMPLE_GS_NEAR_SHIP, {[]{return CanUse(LONGSHOT) && SmallKeys(SHADOW_TEMPLE, 4, 5);}}), }, { //Exits - Entrance(SHADOW_TEMPLE_BEYOND_BOAT, {[]{return CanPlay(ZeldasLullaby) && SmallKeys(SHADOW_TEMPLE, 4, 5);}}), + Entrance(SHADOW_TEMPLE_BEYOND_BOAT, {[]{return CanJumpslash && CanPlay(ZeldasLullaby) && SmallKeys(SHADOW_TEMPLE, 4, 5);}}), }); areaTable[SHADOW_TEMPLE_BEYOND_BOAT] = Area("Shadow Temple Beyond Boat", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(SHADOW_TEMPLE_SPIKE_WALLS_LEFT_CHEST, {[]{return CanUse(DINS_FIRE);}}), LocationAccess(SHADOW_TEMPLE_BOSS_KEY_CHEST, {[]{return CanUse(DINS_FIRE);}}), - LocationAccess(SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_INVISIBLE_FLOORMASTER_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT, {[]{return CanAdultAttack;}}), }, { //Exits Entrance(SHADOW_TEMPLE_BOSS_ENTRYWAY, {[]{return (CanUse(BOW) || CanUse(DISTANT_SCARECROW) || (LogicShadowStatue && HasBombchus)) && SmallKeys(SHADOW_TEMPLE, 5) && CanUse(HOVER_BOOTS) && BossKeyShadowTemple;}}) @@ -102,15 +102,15 @@ void AreaTable_Init_ShadowTemple() { areaTable[SHADOW_TEMPLE_MQ_DEAD_HAND_AREA] = Area("Shadow Temple MQ Dead Hand Area", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(SHADOW_TEMPLE_MQ_COMPASS_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return CanPlay(SongOfTime) && IsAdult && CanUse(BOW);}}), + LocationAccess(SHADOW_TEMPLE_MQ_COMPASS_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(SHADOW_TEMPLE_MQ_HOVER_BOOTS_CHEST, {[]{return CanJumpslash && CanPlay(SongOfTime) && IsAdult && CanUse(BOW);}}), }, {}); areaTable[SHADOW_TEMPLE_MQ_FIRST_BEAMOS] = Area("Shadow Temple MQ First Beamos", "Shadow Temple", SHADOW_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(SHADOW_TEMPLE_MQ_MAP_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_MQ_MAP_CHEST, {[]{return CanAdultAttack || Nuts;}}), + LocationAccess(SHADOW_TEMPLE_MQ_EARLY_GIBDOS_CHEST, {[]{return CanJumpslash;}}), + LocationAccess(SHADOW_TEMPLE_MQ_NEAR_SHIP_INVISIBLE_CHEST, {[]{return CanAdultAttack || Nuts;}}), }, { //Exits Entrance(SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, {[]{return HasExplosives && SmallKeys(SHADOW_TEMPLE, 2);}}), @@ -134,8 +134,9 @@ void AreaTable_Init_ShadowTemple() { LocationAccess(SHADOW_TEMPLE_MQ_FALLING_SPIKES_LOWER_CHEST, {[]{return true;}}), LocationAccess(SHADOW_TEMPLE_MQ_FALLING_SPIKES_UPPER_CHEST, {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}), LocationAccess(SHADOW_TEMPLE_MQ_FALLING_SPIKES_SWITCH_CHEST, {[]{return (LogicShadowUmbrella && HoverBoots) || GoronBracelet;}}), - LocationAccess(SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST, {[]{return HoverBoots && SmallKeys(SHADOW_TEMPLE, 3) && ((LogicLensShadowMQ && LogicLensShadowMQPlatform) || CanUse(LENS_OF_TRUTH));}}), - LocationAccess(SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST, {[]{return HoverBoots && SmallKeys(SHADOW_TEMPLE, 3) && Hookshot && ((LogicLensShadowMQ && LogicLensShadowMQInvisibleBlades && LogicLensShadowMQPlatform) || CanUse(LENS_OF_TRUTH));}}), + LocationAccess(SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST, {[]{return CanJumpslash && HoverBoots && SmallKeys(SHADOW_TEMPLE, 3) && ((LogicLensShadowMQ && LogicLensShadowMQPlatform) || CanUse(LENS_OF_TRUTH));}}), + LocationAccess(SHADOW_TEMPLE_MQ_STALFOS_ROOM_CHEST, {[]{return (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && HoverBoots && SmallKeys(SHADOW_TEMPLE, 3) && Hookshot && ((LogicLensShadowMQ && + LogicLensShadowMQInvisibleBlades && LogicLensShadowMQPlatform) || CanUse(LENS_OF_TRUTH));}}), LocationAccess(SHADOW_TEMPLE_MQ_GS_FALLING_SPIKES_ROOM, {[]{return Hookshot || (LogicShadowUmbrellaGS && HoverBoots);}}), }, { //Exits @@ -148,7 +149,7 @@ void AreaTable_Init_ShadowTemple() { }, { //Locations LocationAccess(SHADOW_TEMPLE_MQ_WIND_HINT_CHEST, {[]{return true;}}), - LocationAccess(SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST, {[]{return true;}}), + LocationAccess(SHADOW_TEMPLE_MQ_AFTER_WIND_ENEMY_CHEST, {[]{return CanJumpslash;}}), LocationAccess(SHADOW_TEMPLE_MQ_AFTER_WIND_HIDDEN_CHEST, {[]{return true;}}), LocationAccess(SHADOW_TEMPLE_MQ_GS_WIND_HINT_ROOM, {[]{return true;}}), LocationAccess(SHADOW_TEMPLE_MQ_GS_AFTER_WIND, {[]{return true;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp index ec01cdbfd..2aa0c0516 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_spirit_temple.cpp @@ -46,9 +46,9 @@ void AreaTable_Init_SpiritTemple() { LocationAccess(SPIRIT_TEMPLE_CHILD_CLIMB_NORTH_CHEST, {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}), LocationAccess(SPIRIT_TEMPLE_CHILD_CLIMB_EAST_CHEST, {[]{return HasProjectile(HasProjectileAge::Both) || ((SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(SILVER_GAUNTLETS) && HasProjectile(HasProjectileAge::Adult)) || (SmallKeys(SPIRIT_TEMPLE, 5) && IsChild && HasProjectile(HasProjectileAge::Child));}}), LocationAccess(SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM, {[]{return HasProjectile(HasProjectileAge::Both) || CanUse(DINS_FIRE) || - (CanTakeDamage && (Sticks || KokiriSword || HasProjectile(HasProjectileAge::Child))) || + (CanTakeDamage && (CanJumpslash || HasProjectile(HasProjectileAge::Child))) || (IsChild && SmallKeys(SPIRIT_TEMPLE, 5) && HasProjectile(HasProjectileAge::Child)) || - ((SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(SILVER_GAUNTLETS) && (HasProjectile(HasProjectileAge::Adult) || CanTakeDamage));}}), + ((SmallKeys(SPIRIT_TEMPLE, 3) || (SmallKeys(SPIRIT_TEMPLE, 2) && BombchusInLogic && ShuffleDungeonEntrances.Is(SHUFFLEDUNGEONS_OFF))) && CanUse(SILVER_GAUNTLETS) && (HasProjectile(HasProjectileAge::Adult) || (CanTakeDamage && CanJumpslash)));}}), }, { //Exits Entrance(SPIRIT_TEMPLE_CENTRAL_CHAMBER, {[]{return HasExplosives || (SunlightArrows && CanUse(LIGHT_ARROWS));}}), @@ -57,7 +57,7 @@ void AreaTable_Init_SpiritTemple() { areaTable[SPIRIT_TEMPLE_EARLY_ADULT] = Area("Early Adult Spirit Temple", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(SPIRIT_TEMPLE_COMPASS_CHEST, {[]{return CanUse(HOOKSHOT) && CanPlay(ZeldasLullaby);}}), - LocationAccess(SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST, {[]{return Bow || Hookshot || HasBombchus || (Bombs && LogicSpiritLowerAdultSwitch);}}), + LocationAccess(SPIRIT_TEMPLE_EARLY_ADULT_RIGHT_CHEST, {[]{return (CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(SLINGSHOT) || CanUse(BOOMERANG) || HasBombchus || (Bombs && IsAdult && LogicSpiritLowerAdultSwitch)) && (CanUse(HOVER_BOOTS) || CanJumpslash);}}), LocationAccess(SPIRIT_TEMPLE_FIRST_MIRROR_LEFT_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 3);}}), LocationAccess(SPIRIT_TEMPLE_FIRST_MIRROR_RIGHT_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 3);}}), LocationAccess(SPIRIT_TEMPLE_GS_BOULDER_ROOM, {[]{return CanPlay(SongOfTime) && (Bow || Hookshot || HasBombchus || (Bombs && LogicSpiritLowerAdultSwitch));}}), @@ -98,7 +98,7 @@ void AreaTable_Init_SpiritTemple() { (SmallKeys(SPIRIT_TEMPLE, 3) && CanUse(SILVER_GAUNTLETS) && (Hookshot || HoverBoots || LogicSpiritLobbyJump));}}), }, { //Exits - Entrance(SPIRIT_TEMPLE_OUTDOOR_HANDS, {[]{return true;}}), + Entrance(SPIRIT_TEMPLE_OUTDOOR_HANDS, {[]{return CanJumpslash || HasExplosives;}}), Entrance(SPIRIT_TEMPLE_BEYOND_CENTRAL_LOCKED_DOOR, {[]{return SmallKeys(SPIRIT_TEMPLE, 4) && CanUse(SILVER_GAUNTLETS);}}), Entrance(SPIRIT_TEMPLE_CHILD_CLIMB, {[]{return true;}}), }); @@ -125,7 +125,7 @@ void AreaTable_Init_SpiritTemple() { areaTable[SPIRIT_TEMPLE_BEYOND_FINAL_LOCKED_DOOR] = Area("Spirit Temple Beyond Final Locked Door", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(SPIRIT_TEMPLE_BOSS_KEY_CHEST, {[]{return CanPlay(ZeldasLullaby) && ((CanTakeDamage && LogicFlamingChests) || (Bow && Hookshot));}}), - LocationAccess(SPIRIT_TEMPLE_TOPMOST_CHEST, {[]{return MirrorShield || (SunlightArrows && CanUse(LIGHT_ARROWS));}}), + LocationAccess(SPIRIT_TEMPLE_TOPMOST_CHEST, {[]{return (MirrorShield && CanAdultAttack) || (SunlightArrows && CanUse(LIGHT_ARROWS));}}), }, { //Exits Entrance(SPIRIT_TEMPLE_INSIDE_STATUE_HEAD, {[]{return MirrorShield && HasExplosives && Hookshot;}}), @@ -174,7 +174,7 @@ void AreaTable_Init_SpiritTemple() { areaTable[SPIRIT_TEMPLE_MQ_ADULT] = Area("Spirit Temple MQ Adult", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations LocationAccess(SPIRIT_TEMPLE_MQ_CHILD_CLIMB_SOUTH_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 7);}}), - LocationAccess(SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST, {[]{return CanPlay(ZeldasLullaby);}}), + LocationAccess(SPIRIT_TEMPLE_MQ_STATUE_ROOM_LULLABY_CHEST, {[]{return CanPlay(ZeldasLullaby) && (CanJumpslash || CanUse(HOVER_BOOTS));}}), LocationAccess(SPIRIT_TEMPLE_MQ_STATUE_ROOM_INVISIBLE_CHEST, {[]{return (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH));}}), LocationAccess(SPIRIT_TEMPLE_MQ_BEAMOS_ROOM_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 5);}}), LocationAccess(SPIRIT_TEMPLE_MQ_CHEST_SWITCH_CHEST, {[]{return SmallKeys(SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime);}}), @@ -187,7 +187,7 @@ void AreaTable_Init_SpiritTemple() { //Trick: MirrorShield && IsAdult && (CanUse(FIRE_ARROWS) || (LogicSpiritMQLowerAdult && CanUse(DINS_FIRE) && Bow)) Entrance(SPIRIT_TEMPLE_MQ_SHARED, {[]{return true;}}), Entrance(SPIRIT_TEMPLE_MQ_BOSS_AREA, {[]{return SmallKeys(SPIRIT_TEMPLE, 6) && CanPlay(ZeldasLullaby) && Hammer;}}), - Entrance(SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH));}}), + Entrance(SPIRIT_TEMPLE_MQ_MIRROR_SHIELD_HAND, {[]{return SmallKeys(SPIRIT_TEMPLE, 5) && CanPlay(SongOfTime) && CanJumpslash && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH));}}), }); areaTable[SPIRIT_TEMPLE_MQ_SHARED] = Area("Spirit Temple MQ Shared", "Spirit Temple", SPIRIT_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -200,9 +200,9 @@ void AreaTable_Init_SpiritTemple() { //Trick: (LogicSpiritMQSunBlockGS && Boomerang && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT)) || IsAdult }, { //Exits - Entrance(SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)));}}), + Entrance(SPIRIT_TEMPLE_MQ_SILVER_GAUNTLETS_HAND, {[]{return (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && CanJumpslash && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)));}}), //Trick: (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH))) - Entrance(DESERT_COLOSSUS, {[]{return (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)) && IsAdult);}}), + Entrance(DESERT_COLOSSUS, {[]{return (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && CanJumpslash && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)) && IsAdult);}}), //Trick: (SmallKeys(SPIRIT_TEMPLE, 7) && (CanPlay(SongOfTime) || LogicSpiritMQSunBlockSoT || IsAdult)) || (SmallKeys(SPIRIT_TEMPLE, 4) && CanPlay(SongOfTime) && (LogicLensSpiritMQ || CanUse(LENS_OF_TRUTH)) && IsAdult) }); diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp index 79d9dff7c..559b6c20c 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_water_temple.cpp @@ -122,7 +122,7 @@ void AreaTable_Init_WaterTemple() { areaTable[WATER_TEMPLE_SOUTH_LOWER] = Area("Water Temple South Lower", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(WATER_TEMPLE_GS_BEHIND_GATE, {[]{return CanUse(HOOKSHOT) || (IsAdult && CanUse(HOVER_BOOTS));}}), + LocationAccess(WATER_TEMPLE_GS_BEHIND_GATE, {[]{return (CanJumpslash || CanUse(MEGATON_HAMMER)) && (CanUse(HOOKSHOT) || (IsAdult && CanUse(HOVER_BOOTS)));}}), }, { //Exits Entrance(WATER_TEMPLE_LOBBY, {[]{return CanUse(IRON_BOOTS);}}), @@ -131,7 +131,7 @@ void AreaTable_Init_WaterTemple() { areaTable[WATER_TEMPLE_WEST_LOWER] = Area("Water Temple West Lower", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(WATER_TEMPLE_LOBBY, {[]{return CanUse(HOOKSHOT) && CanUse(IRON_BOOTS) && GoronBracelet;}}), - Entrance(WATER_TEMPLE_DRAGON_ROOM, {[]{return IsAdult || CanChildAttack;}}), + Entrance(WATER_TEMPLE_DRAGON_ROOM, {[]{return CanJumpslash || CanUseProjectile;}}), }); areaTable[WATER_TEMPLE_DRAGON_ROOM] = Area("Water Temple Dragon Room", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -257,8 +257,8 @@ void AreaTable_Init_WaterTemple() { //Exits Entrance(WATER_TEMPLE_ENTRYWAY, {[]{return true;}}), Entrance(WATER_TEMPLE_MQ_DIVE, {[]{return IsAdult && WaterTimer >= 24 && CanUse(IRON_BOOTS);}}), - Entrance(WATER_TEMPLE_MQ_DARK_LINK_REGION, {[]{return SmallKeys(WATER_TEMPLE, 1) && IsAdult && CanUse(LONGSHOT);}}), - Entrance(WATER_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyWaterTemple && IsAdult && CanUse(LONGSHOT);}}), + Entrance(WATER_TEMPLE_MQ_DARK_LINK_REGION, {[]{return SmallKeys(WATER_TEMPLE, 1) && IsAdult && CanUse(LONGSHOT) && CanJumpslash && Hearts > 0;}}), + Entrance(WATER_TEMPLE_BOSS_ENTRYWAY, {[]{return BossKeyWaterTemple && IsAdult && CanJumpslash && CanUse(LONGSHOT);}}), }); areaTable[WATER_TEMPLE_MQ_DIVE] = Area("Water Temple MQ Dive", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { @@ -273,7 +273,8 @@ void AreaTable_Init_WaterTemple() { areaTable[WATER_TEMPLE_MQ_LOWERED_WATER_LEVELS] = Area("Water Temple MQ Lowered Water Levels", "Water Temple", WATER_TEMPLE, NO_DAY_NIGHT_CYCLE, {}, { //Locations - LocationAccess(WATER_TEMPLE_MQ_COMPASS_CHEST, {[]{return (IsAdult && CanUse(BOW)) || CanUse(DINS_FIRE) || Here(WATER_TEMPLE_MQ_LOBBY, []{return IsChild && CanUse(STICKS) && HasExplosives;});}}), + LocationAccess(WATER_TEMPLE_MQ_COMPASS_CHEST, {[]{return ((IsAdult && CanUse(BOW)) || CanUse(DINS_FIRE) || Here(WATER_TEMPLE_MQ_LOBBY, []{return IsChild && CanUse(STICKS) && HasExplosives;})) && + (CanJumpslash || CanUseProjectile);}}), LocationAccess(WATER_TEMPLE_MQ_LONGSHOT_CHEST, {[]{return IsAdult && CanUse(HOOKSHOT);}}), LocationAccess(WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY, {[]{return CanUse(DINS_FIRE);}}), LocationAccess(WATER_TEMPLE_MQ_GS_BEFORE_UPPER_WATER_SWITCH, {[]{return IsAdult && CanUse(LONGSHOT);}}), @@ -296,7 +297,7 @@ void AreaTable_Init_WaterTemple() { //Locations LocationAccess(WATER_TEMPLE_MQ_FREESTANDING_KEY, {[]{return HoverBoots || CanUse(SCARECROW) || LogicWaterNorthBasementLedgeJump;}}), LocationAccess(WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH, {[]{return CanUse(FIRE_ARROWS) && (HoverBoots || CanUse(SCARECROW));}}), - LocationAccess(WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {[]{return LogicWaterMQLockedGS || (SmallKeys(WATER_TEMPLE, 2) && (HoverBoots || CanUse(SCARECROW) || LogicWaterNorthBasementLedgeJump));}}), + LocationAccess(WATER_TEMPLE_MQ_GS_FREESTANDING_KEY_AREA, {[]{return LogicWaterMQLockedGS || (SmallKeys(WATER_TEMPLE, 2) && (HoverBoots || CanUse(SCARECROW) || LogicWaterNorthBasementLedgeJump) && CanJumpslash);}}), //Trick: LogicWaterMQLockedGS || (SmallKeys(WATER_TEMPLE, 2) && (HoverBoots || CanUse(SCARECROW) || LogicWaterNorthBasementLedgeJump)) }, {}); } diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp index 6d46e783e..434095145 100644 --- a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_zoras_domain.cpp @@ -48,7 +48,7 @@ void AreaTable_Init_ZorasDomain() { Entrance(ZR_BEHIND_WATERFALL, {[]{return CanPlay(ZeldasLullaby) || (IsChild && LogicZoraWithCucco) || (IsAdult && CanUse(HOVER_BOOTS) && LogicZoraWithHovers);}}), }); - areaTable[ZR_BEHIND_WATERFALL] = Area("ZR Behind Waterfall", "Zora River", NONE, DAY_NIGHT_CYCLE, {}, {}, { + areaTable[ZR_BEHIND_WATERFALL] = Area("ZR Behind Waterfall", "Zora River", ZORAS_RIVER, DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(ZORAS_RIVER, {[]{return true;}}), Entrance(ZORAS_DOMAIN, {[]{return true;}}), @@ -95,7 +95,7 @@ void AreaTable_Init_ZorasDomain() { LocationAccess(ZD_CHEST, {[]{return IsChild && CanUse(STICKS);}}), LocationAccess(ZD_KING_ZORA_THAWED, {[]{return KingZoraThawed;}}), LocationAccess(ZD_TRADE_PRESCRIPTION, {[]{return KingZoraThawed && Prescription;}}), - LocationAccess(ZD_GS_FROZEN_WATERFALL, {[]{return IsAdult && AtNight && (HookshotOrBoomerang || CanUse(SLINGSHOT) || Bow || MagicMeter || LogicDomainGS) && CanGetNightTimeGS;}}), + LocationAccess(ZD_GS_FROZEN_WATERFALL, {[]{return IsAdult && AtNight && (HookshotOrBoomerang || CanUse(SLINGSHOT) || Bow || (MagicMeter && (CanUse(MASTER_SWORD) || CanUse(KOKIRI_SWORD) || CanUse(BIGGORON_SWORD))) || (LogicDomainGS && CanJumpslash)) && CanGetNightTimeGS;}}), LocationAccess(ZD_GOSSIP_STONE, {[]{return true;}}), }, { //Exits @@ -106,7 +106,7 @@ void AreaTable_Init_ZorasDomain() { Entrance(ZD_STORMS_GROTTO, {[]{return CanOpenStormGrotto;}}), }); - areaTable[ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", NONE, NO_DAY_NIGHT_CYCLE, {}, {}, { + areaTable[ZD_BEHIND_KING_ZORA] = Area("ZD Behind King Zora", "Zoras Domain", ZORAS_DOMAIN, NO_DAY_NIGHT_CYCLE, {}, {}, { //Exits Entrance(ZORAS_DOMAIN, {[]{return DeliverLetter || ZorasFountain.Is(ZORASFOUNTAIN_OPEN) || (ZorasFountain.Is(ZORASFOUNTAIN_ADULT) && IsAdult);}}), Entrance(ZORAS_FOUNTAIN, {[]{return true;}}), diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.cpp b/soh/soh/Enhancements/randomizer/3drando/logic.cpp index ddf53824e..580c687d0 100644 --- a/soh/soh/Enhancements/randomizer/3drando/logic.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/logic.cpp @@ -121,7 +121,8 @@ namespace Logic { //Greg bool Greg = false; - bool GregInLogic = false; + bool GregInBridgeLogic = false; + bool GregInLacsLogic = false; //Progressive Items uint8_t ProgressiveBulletBag = 0; @@ -255,6 +256,8 @@ namespace Logic { bool CanBlastOrSmash = false; bool CanChildAttack = false; bool CanChildDamage = false; + bool CanAdultAttack = false; + bool CanAdultDamage = false; bool CanCutShrubs = false; bool CanDive = false; bool CanLeaveForest = false; @@ -510,7 +513,6 @@ namespace Logic { SilverScale = ProgressiveScale >= 1; GoldScale = ProgressiveScale >= 2; AdultsWallet = ProgressiveWallet >= 1; - MasterSword = MasterSword || IsAdult; BiggoronSword = BiggoronSword || ProgressiveGiantKnife >= 2; ScarecrowSong = ScarecrowSong || FreeScarecrow || (ChildScarecrow && AdultScarecrow); @@ -559,8 +561,10 @@ namespace Logic { CanBlastOrSmash = HasExplosives || CanUse(MEGATON_HAMMER); CanChildAttack = IsChild && (Slingshot || Boomerang || Sticks || KokiriSword || HasExplosives || CanUse(DINS_FIRE) || CanUse(MASTER_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(BIGGORON_SWORD)); CanChildDamage = IsChild && (Slingshot || Sticks || KokiriSword || HasExplosives || CanUse(DINS_FIRE) || CanUse(MASTER_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(BIGGORON_SWORD)); - CanStunDeku = IsAdult || CanChildAttack || Nuts || HasShield; - CanCutShrubs = IsAdult /*|| Sticks*/ || KokiriSword || Boomerang || HasExplosives || CanUse(MASTER_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(BIGGORON_SWORD); + CanAdultAttack = IsAdult && (CanUse(BOW) || CanUse(BOOMERANG) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || HasExplosives || CanUse(DINS_FIRE) || MasterSword || Hammer || BiggoronSword || Hookshot); + CanAdultDamage = IsAdult && (CanUse(BOW) || CanUse(STICKS) || CanUse(KOKIRI_SWORD) || HasExplosives || CanUse(DINS_FIRE) || MasterSword || Hammer || BiggoronSword); + CanStunDeku = CanAdultAttack || CanChildAttack || Nuts || HasShield; + CanCutShrubs = CanUse(KOKIRI_SWORD) || CanUse(BOOMERANG) || HasExplosives || CanUse(MASTER_SWORD) || CanUse(MEGATON_HAMMER) || CanUse(BIGGORON_SWORD); CanDive = ProgressiveScale >= 1; CanLeaveForest = OpenForest.IsNot(OPENFOREST_CLOSED) || IsAdult || DekuTreeClear || ShuffleInteriorEntrances || ShuffleOverworldEntrances; CanPlantBugs = IsChild && Bugs; @@ -587,8 +591,8 @@ namespace Logic { HasFireSourceWithTorch = HasFireSource || CanUse(STICKS); //Gerudo Fortress - CanFinishGerudoFortress = (GerudoFortress.Is(GERUDOFORTRESS_NORMAL) && GerudoFortressKeys >= 4 && (IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen)) || - (GerudoFortress.Is(GERUDOFORTRESS_FAST) && GerudoFortressKeys >= 1 && (IsAdult || KokiriSword || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD))) || + CanFinishGerudoFortress = (GerudoFortress.Is(GERUDOFORTRESS_NORMAL) && GerudoFortressKeys >= 4 && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD)) && (GerudoToken || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(HOVER_BOOTS) || LogicGerudoKitchen)) || + (GerudoFortress.Is(GERUDOFORTRESS_FAST) && GerudoFortressKeys >= 1 && (CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD))) || (GerudoFortress.IsNot(GERUDOFORTRESS_NORMAL) && GerudoFortress.IsNot(GERUDOFORTRESS_FAST)); HasShield = CanUse(HYLIAN_SHIELD) || CanUse(DEKU_SHIELD); //Mirror shield can't reflect attacks @@ -597,7 +601,7 @@ namespace Logic { AdultReflectShield = IsAdult && CanUse(HYLIAN_SHIELD); //Mirror shield can't reflect attacks AdultShield = IsAdult && (CanUse(HYLIAN_SHIELD) || CanUse(MIRROR_SHIELD)); CanShieldFlick = ChildShield || AdultShield; - CanJumpslash = IsAdult || Sticks || KokiriSword; + CanJumpslash = CanUse(STICKS) || CanUse(KOKIRI_SWORD) || CanUse(MASTER_SWORD) || CanUse(BIGGORON_SWORD); // Not including hammer as hammer jump attacks can be weird CanUseProjectile = HasExplosives || CanUse(BOW) || CanUse(HOOKSHOT) || CanUse(SLINGSHOT) || CanUse(BOOMERANG); CanUseMagicArrow = CanUse(FIRE_ARROWS) || CanUse(ICE_ARROWS) || CanUse(LIGHT_ARROWS); @@ -607,22 +611,23 @@ namespace Logic { DungeonCount = (DekuTreeClear ? 1:0) + (DodongosCavernClear ? 1:0) + (JabuJabusBellyClear ? 1:0) + (ForestTempleClear ? 1:0) + (FireTempleClear ? 1:0) + (WaterTempleClear ? 1:0) + (SpiritTempleClear ? 1:0) + (ShadowTempleClear ? 1:0); HasAllStones = StoneCount == 3; HasAllMedallions = MedallionCount == 6; - GregInLogic = BridgeRewardOptions.Is(BRIDGE_OPTION_GREG) || LACSRewardOptions.Is(LACS_OPTION_GREG); + GregInBridgeLogic = BridgeRewardOptions.Is(BRIDGE_OPTION_GREG); + GregInLacsLogic = LACSRewardOptions.Is(LACS_OPTION_GREG); CanBuildRainbowBridge = Bridge.Is(RAINBOWBRIDGE_OPEN) || (Bridge.Is(RAINBOWBRIDGE_VANILLA) && ShadowMedallion && SpiritMedallion && LightArrows) || - (Bridge.Is(RAINBOWBRIDGE_STONES) && StoneCount + (Greg && GregInLogic ? 1 : 0) >= BridgeStoneCount.Value()) || - (Bridge.Is(RAINBOWBRIDGE_MEDALLIONS) && MedallionCount + (Greg && GregInLogic ? 1 : 0) >= BridgeMedallionCount.Value()) || - (Bridge.Is(RAINBOWBRIDGE_REWARDS) && StoneCount + MedallionCount + (Greg && GregInLogic ? 1 : 0) >= BridgeRewardCount.Value()) || - (Bridge.Is(RAINBOWBRIDGE_DUNGEONS) && DungeonCount + (Greg && GregInLogic ? 1 : 0) >= BridgeDungeonCount.Value()) || + (Bridge.Is(RAINBOWBRIDGE_STONES) && StoneCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeStoneCount.Value()) || + (Bridge.Is(RAINBOWBRIDGE_MEDALLIONS) && MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeMedallionCount.Value()) || + (Bridge.Is(RAINBOWBRIDGE_REWARDS) && StoneCount + MedallionCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeRewardCount.Value()) || + (Bridge.Is(RAINBOWBRIDGE_DUNGEONS) && DungeonCount + (Greg && GregInBridgeLogic ? 1 : 0) >= BridgeDungeonCount.Value()) || (Bridge.Is(RAINBOWBRIDGE_TOKENS) && GoldSkulltulaTokens >= BridgeTokenCount.Value()) || (Bridge.Is(RAINBOWBRIDGE_GREG) && Greg); CanTriggerLACS = (LACSCondition == LACSCONDITION_VANILLA && ShadowMedallion && SpiritMedallion) || - (LACSCondition == LACSCONDITION_STONES && StoneCount + (Greg && GregInLogic ? 1 : 0) >= LACSStoneCount.Value()) || - (LACSCondition == LACSCONDITION_MEDALLIONS && MedallionCount + (Greg && GregInLogic ? 1 : 0) >= LACSMedallionCount.Value()) || - (LACSCondition == LACSCONDITION_REWARDS && StoneCount + MedallionCount + (Greg && GregInLogic ? 1 : 0) >= LACSRewardCount.Value()) || - (LACSCondition == LACSCONDITION_DUNGEONS && DungeonCount + (Greg && GregInLogic ? 1 : 0) >= LACSDungeonCount.Value()) || + (LACSCondition == LACSCONDITION_STONES && StoneCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSStoneCount.Value()) || + (LACSCondition == LACSCONDITION_MEDALLIONS && MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSMedallionCount.Value()) || + (LACSCondition == LACSCONDITION_REWARDS && StoneCount + MedallionCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSRewardCount.Value()) || + (LACSCondition == LACSCONDITION_DUNGEONS && DungeonCount + (Greg && GregInLacsLogic ? 1 : 0) >= LACSDungeonCount.Value()) || (LACSCondition == LACSCONDITION_TOKENS && GoldSkulltulaTokens >= LACSTokenCount.Value()); CanCompleteTriforce = TriforcePieces >= TriforceHuntRequired.Value(); } @@ -835,6 +840,8 @@ namespace Logic { //Greg Greg = false; + GregInBridgeLogic = false; + GregInLacsLogic = false; //Progressive Items ProgressiveBulletBag = 0; diff --git a/soh/soh/Enhancements/randomizer/3drando/logic.hpp b/soh/soh/Enhancements/randomizer/3drando/logic.hpp index 4d24fd3ff..2c5bca890 100644 --- a/soh/soh/Enhancements/randomizer/3drando/logic.hpp +++ b/soh/soh/Enhancements/randomizer/3drando/logic.hpp @@ -115,6 +115,8 @@ extern bool LightTrialClear; //Greg extern bool Greg; +extern bool GregInBridgeLogic; +extern bool GregInLacsLogic; // Progression Items extern uint8_t ProgressiveBulletBag; @@ -245,6 +247,8 @@ extern bool IsGlitched; extern bool CanBlastOrSmash; extern bool CanChildAttack; extern bool CanChildDamage; +extern bool CanAdultAttack; +extern bool CanAdultDamage; extern bool CanCutShrubs; extern bool CanDive; extern bool CanLeaveForest; diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp index 42fdae5c1..08d09cfa8 100644 --- a/soh/soh/Enhancements/randomizer/3drando/settings.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/settings.cpp @@ -176,26 +176,28 @@ namespace Settings { }; //Shuffle Settings - Option RandomizeShuffle = Option::Bool("Randomize Settings", {"No","Yes"}, OptionCategory::Toggle); - Option ShuffleRewards = Option::U8 ("Shuffle Dungeon Rewards",{"End of dungeons", "Any dungeon", "Overworld", "Anywhere"}); - Option LinksPocketItem = Option::U8 ("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"}); - Option ShuffleSongs = Option::U8 ("Shuffle Songs", {"Song locations", "Dungeon rewards", "Anywhere"}); - Option Shopsanity = Option::U8 ("Shopsanity", {"Off","0 Items","1 Item","2 Items","3 Items","4 Items","Random"}); - Option ShopsanityPrices = Option::U8 ("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet" }); - Option ShopsanityPricesAffordable = Option::Bool("Affordable Prices", {"Off", "On"}); - Option Tokensanity = Option::U8 ("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"}); - Option Scrubsanity = Option::U8 ("Scrub Shuffle", {"Off", "Affordable", "Expensive", "Random Prices"}); - Option ShuffleCows = Option::Bool("Shuffle Cows", {"Off", "On"}); - Option ShuffleKokiriSword = Option::Bool("Shuffle Kokiri Sword", {"Off", "On"}); - Option ShuffleOcarinas = Option::Bool("Shuffle Ocarinas", {"Off", "On"}); - Option ShuffleWeirdEgg = Option::Bool("Shuffle Weird Egg", {"Off", "On"}); - Option ShuffleGerudoToken = Option::Bool("Shuffle Gerudo Card", {"Off", "On"}); - Option ShuffleMagicBeans = Option::Bool("Shuffle Magic Beans", {"Off", "On"}); - Option ShuffleMerchants = Option::U8 ("Shuffle Merchants", {"Off", "On (No Hints)", "On (With Hints)"}); - Option ShuffleFrogSongRupees = Option::Bool("Shuffle Frog Song Rupees",{"Off", "On"}); - Option ShuffleAdultTradeQuest = Option::Bool("Shuffle Adult Trade", {"Off", "On"}); - Option ShuffleChestMinigame = Option::U8 ("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"}); - Option Shuffle100GSReward = Option::Bool("Shuffle 100 GS Reward", {"Off", "On"}); + Option RandomizeShuffle = Option::Bool("Randomize Settings", {"No","Yes"}, OptionCategory::Toggle); + Option ShuffleRewards = Option::U8 ("Shuffle Dungeon Rewards",{"End of dungeons", "Any dungeon", "Overworld", "Anywhere"}); + Option LinksPocketItem = Option::U8 ("Link's Pocket", {"Dungeon Reward", "Advancement", "Anything", "Nothing"}); + Option ShuffleSongs = Option::U8 ("Shuffle Songs", {"Song locations", "Dungeon rewards", "Anywhere"}); + Option Shopsanity = Option::U8 ("Shopsanity", {"Off","0 Items","1 Item","2 Items","3 Items","4 Items","Random"}); + Option ShopsanityPrices = Option::U8 ("Shopsanity Prices", {"Balanced", "Starting Wallet", "Adult Wallet", "Giant's Wallet", "Tycoon's Wallet" }); + Option ShopsanityPricesAffordable = Option::Bool("Affordable Prices", {"Off", "On"}); + Option Tokensanity = Option::U8 ("Tokensanity", {"Off", "Dungeons", "Overworld", "All Tokens"}); + Option Scrubsanity = Option::U8 ("Scrub Shuffle", {"Off", "Affordable", "Expensive", "Random Prices"}); + Option ShuffleCows = Option::Bool("Shuffle Cows", {"Off", "On"}); + Option ShuffleKokiriSword = Option::Bool("Shuffle Kokiri Sword", {"Off", "On"}); + Option ShuffleMasterSword = Option::Bool("Shuffle Master Sword", {"Off", "On"}); + Option ShuffleOcarinas = Option::Bool("Shuffle Ocarinas", {"Off", "On"}); + Option ShuffleWeirdEgg = Option::Bool("Shuffle Weird Egg", {"Off", "On"}); + Option ShuffleGerudoToken = Option::Bool("Shuffle Gerudo Card", {"Off", "On"}); + Option ShuffleMagicBeans = Option::Bool("Shuffle Magic Beans", {"Off", "On"}); + Option ShuffleMerchants = Option::U8 ("Shuffle Merchants", {"Off", "On (No Hints)", "On (With Hints)"}); + Option ShuffleFrogSongRupees = Option::Bool("Shuffle Frog Song Rupees",{"Off", "On"}); + Option ShuffleAdultTradeQuest = Option::Bool("Shuffle Adult Trade", {"Off", "On"}); + Option ShuffleChestMinigame = Option::U8 ("Shuffle Chest Minigame", {"Off", "On (Separate)", "On (Pack)"}); + Option Shuffle100GSReward = Option::Bool("Shuffle 100 GS Reward", {"Off", "On"}); + std::vector