diff --git a/.gitignore b/.gitignore index 048e86c3..5add5739 100644 --- a/.gitignore +++ b/.gitignore @@ -4,35 +4,14 @@ # Exclude converted resource files src/Resource -# Exclude .dat and .rec files in build directories (avoid Config.dat, 290.rec and others) -build_en/*.dat -build_en/*.rec -build_jp/*.dat -build_jp/*.rec +# Exclude build output directory +/game -# Exclude devilution-comparer assembly output +Exclude devilution-comparer assembly output msvc2003/devilution/orig.asm msvc2003/devilution/compare.asm -# Exclude build output on Linux (exclude normally produced executable files and out files) -build_en/CSE2 -build_en/CSE2_debug -build_en/DoConfig -build_en/DoConfig_debug -build_jp/CSE2 -build_jp/CSE2_debug -build_jp/DoConfig -build_jp/DoConfig_debug -build_en/*.out -build_jp/*.out - -# Exclude PE executables in the build folder (and .exe.manifest files) -build_en/*.exe -build_en/*.exe.manifest -build_jp/*.exe -build_jp/*.exe.manifest - -# Exclude the (recommended) CMake build directory +Exclude the (recommended) CMake build directory build/* # Exclude MSVC IntelliSense database diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fb63af5..d0fcd886 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,9 @@ if((${CMAKE_VERSION} VERSION_EQUAL 3.9) OR (${CMAKE_VERSION} VERSION_GREATER 3.9 cmake_policy(SET CMP0069 NEW) endif() +set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/game") +set(ASSETS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/assets") + option(JAPANESE "Enable the Japanese-language build" OFF) option(FIX_BUGS "Fix certain bugs (see src/Bug Fixes.txt)" OFF) option(NONPORTABLE "Enable bits of code that aren't portable, but are what the original game used" OFF) @@ -221,11 +224,11 @@ set(RESOURCES # Handle options if(JAPANESE) - set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build_jp") + set(DATA_DIRECTORY "${ASSETS_DIRECTORY}/data_jp") list(APPEND RESOURCES "BITMAP/pixel_jp.bmp") target_compile_definitions(CSE2 PRIVATE JAPANESE) else() - set(BUILD_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build_en") + set(DATA_DIRECTORY "${ASSETS_DIRECTORY}/data_en") list(APPEND RESOURCES "BITMAP/pixel.bmp") endif() @@ -243,7 +246,7 @@ endif() # Make some tweaks if we're targetting Windows if(WIN32) - target_sources(CSE2 PRIVATE "res/ICON/ICON.rc") + target_sources(CSE2 PRIVATE "${ASSETS_DIRECTORY}/resources/ICON/ICON.rc") target_compile_definitions(CSE2 PRIVATE WINDOWS) set_target_properties(CSE2 PROPERTIES WIN32_EXECUTABLE YES) # Disable the console window else() @@ -262,17 +265,37 @@ elseif(NOT WIN32) list(APPEND RESOURCES "FONT/cour.ttf") endif() -# Magic to convert resources to header files -add_subdirectory("bin2h") +# Build bin2h externally, so it isn't cross-compiled when CSE2 is (Emscripten) +include(ExternalProject) + +ExternalProject_Add(bin2h + SOURCE_DIR "${CMAKE_SOURCE_DIR}/bin2h" + DOWNLOAD_COMMAND "" + UPDATE_COMMAND "" + BUILD_BYPRODUCTS "/bin/bin2h" + CMAKE_ARGS + -DCMAKE_INSTALL_PREFIX= + -DCMAKE_BUILD_TYPE=Release + INSTALL_COMMAND + ${CMAKE_COMMAND} --build . --config Release --target install +) + +ExternalProject_Get_Property(bin2h INSTALL_DIR) + +add_executable(bin2h_tool IMPORTED) +add_dependencies(bin2h_tool bin2h) +set_target_properties(bin2h_tool PROPERTIES IMPORTED_LOCATION "${INSTALL_DIR}/bin/bin2h") + +# Convert resources to header files foreach(FILENAME IN LISTS RESOURCES) - set(IN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/res") + set(IN_DIR "${ASSETS_DIRECTORY}/resources") set(OUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/Resource") get_filename_component(DIRECTORY "${FILENAME}" DIRECTORY) add_custom_command( OUTPUT "${OUT_DIR}/${FILENAME}.h" COMMAND ${CMAKE_COMMAND} -E make_directory "${OUT_DIR}/${DIRECTORY}" - COMMAND bin2h "${IN_DIR}/${FILENAME}" "${OUT_DIR}/${FILENAME}.h" - DEPENDS bin2h "${IN_DIR}/${FILENAME}" + COMMAND bin2h_tool "${IN_DIR}/${FILENAME}" "${OUT_DIR}/${FILENAME}.h" + DEPENDS bin2h_tool "${IN_DIR}/${FILENAME}" ) target_sources(CSE2 PRIVATE "${OUT_DIR}/${FILENAME}.h") endforeach() @@ -303,6 +326,12 @@ set_target_properties(CSE2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${BUILD_DIRECTORY} ) +# Copy data folder to build directory +add_custom_command(TARGET CSE2 POST_BUILD + COMMAND ${CMAKE_COMMAND} -E remove_directory "${BUILD_DIRECTORY}/data" + COMMAND ${CMAKE_COMMAND} -E copy_directory "${DATA_DIRECTORY}" "${BUILD_DIRECTORY}/data" +) + # Enable link-time optimisation if available if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") if((${CMAKE_VERSION} VERSION_EQUAL 3.9) OR (${CMAKE_VERSION} VERSION_GREATER 3.9)) @@ -361,6 +390,7 @@ else() target_link_libraries(CSE2 freetype) endif() + ## # DoConfig ## diff --git a/DoConfig/DoConfig.cpp b/DoConfig/DoConfig.cpp index 185ca7b6..d8cae819 100644 --- a/DoConfig/DoConfig.cpp +++ b/DoConfig/DoConfig.cpp @@ -5,14 +5,17 @@ * http://sam.zoy.org/wtfpl/COPYING for more details. */ #include -#include #include -#include #include "FL/Fl.H" #include "FL/Fl_Window.H" #include "FL/Fl_Radio_Round_Button.H" #include "FL/Fl_Choice.H" #include "FL/Fl_Check_Button.H" +#include +#include +#include +#include +#include #define MAGIC "DOUKUTSU20041206" #define FONT "Courier New" diff --git a/Makefile b/Makefile index f03e0e10..3c4bb65b 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,9 @@ +NATIVECC = cc +NATIVECXX = c++ + +BUILD_DIRECTORY = game +ASSETS_DIRECTORY = assets + ifeq ($(RELEASE), 1) CXXFLAGS = -O3 -flto LDFLAGS = -s @@ -8,11 +14,11 @@ else endif ifeq ($(JAPANESE), 1) - BUILD_DIR = build_jp + DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_jp CXXFLAGS += -DJAPANESE else - BUILD_DIR = build_en + DATA_DIRECTORY = $(ASSETS_DIRECTORY)/data_en endif FILENAME ?= $(FILENAME_DEF) @@ -179,7 +185,7 @@ RESOURCES = \ ORG/White.org \ ORG/XXXX.org \ ORG/Zonbie.org \ - WAVE/Wave.dat \ + WAVE/Wave.dat ifeq ($(JAPANESE), 1) RESOURCES += BITMAP/pixel_jp.bmp @@ -196,32 +202,37 @@ ifneq ($(WINDOWS), 1) RESOURCES += ICON/ICON_MINI.bmp endif -OBJECTS = $(addprefix obj/$(BUILD_DIR)/$(FILENAME)/, $(addsuffix .o, $(SOURCES))) -DEPENDENCIES = $(addprefix obj/$(BUILD_DIR)/$(FILENAME)/, $(addsuffix .o.d, $(SOURCES))) +OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES))) +DEPENDENCIES = $(addprefix obj/$(FILENAME)/, $(addsuffix .o.d, $(SOURCES))) ifeq ($(WINDOWS), 1) - OBJECTS += obj/$(BUILD_DIR)/$(FILENAME)/win_icon.o + OBJECTS += obj/$(FILENAME)/win_icon.o endif -all: $(BUILD_DIR)/$(FILENAME) +all: $(BUILD_DIRECTORY)/$(FILENAME) $(BUILD_DIRECTORY)/data + @echo Finished -$(BUILD_DIR)/$(FILENAME): $(OBJECTS) +$(BUILD_DIRECTORY)/data: $(DATA_DIRECTORY) @mkdir -p $(@D) - @echo Linking + @rm -rf $(BUILD_DIRECTORY)/data + @cp -r $(DATA_DIRECTORY) $(BUILD_DIRECTORY)/data + +$(BUILD_DIRECTORY)/$(FILENAME): $(OBJECTS) + @mkdir -p $(@D) + @echo Linking $@ @$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) - @echo Finished compiling: $@ -obj/$(BUILD_DIR)/$(FILENAME)/%.o: src/%.cpp +obj/$(FILENAME)/%.o: src/%.cpp @mkdir -p $(@D) @echo Compiling $< @$(CXX) $(CXXFLAGS) $< -o $@ -c -obj/$(BUILD_DIR)/$(FILENAME)/Resource.o: src/Resource.cpp $(addprefix src/Resource/, $(addsuffix .h, $(RESOURCES))) +obj/$(FILENAME)/Resource.o: src/Resource.cpp $(addprefix src/Resource/, $(addsuffix .h, $(RESOURCES))) @mkdir -p $(@D) @echo Compiling $< @$(CXX) $(CXXFLAGS) $< -o $@ -c -src/Resource/%.h: res/% obj/bin2h +src/Resource/%.h: $(ASSETS_DIRECTORY)/resources/% obj/bin2h @mkdir -p $(@D) @echo Converting $< @obj/bin2h $< $@ @@ -229,11 +240,11 @@ src/Resource/%.h: res/% obj/bin2h obj/bin2h: bin2h/bin2h.c @mkdir -p $(@D) @echo Compiling $^ - @$(CC) -O3 -s -std=c90 -Wall -Wextra -pedantic $^ -o $@ + @$(NATIVECC) -O3 -s -std=c90 -Wall -Wextra -pedantic $^ -o $@ include $(wildcard $(DEPENDENCIES)) -obj/$(BUILD_DIR)/$(FILENAME)/win_icon.o: res/ICON/ICON.rc res/ICON/0.ico res/ICON/ICON_MINI.ico +obj/$(FILENAME)/win_icon.o: $(ASSETS_DIRECTORY)/resources/ICON/ICON.rc $(ASSETS_DIRECTORY)/resources/ICON/0.ico $(ASSETS_DIRECTORY)/resources/ICON/ICON_MINI.ico @mkdir -p $(@D) @windres $< $@ diff --git a/README.md b/README.md index 5b20fef9..b05ead4e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Cave Story Engine 2 is a decompilation of Cave Story, ported from DirectX to SDL ## Dependencies -*Note: if these are not found, they will be built locally (CMake only)* +*Note: with CMake, if these are not found, they will be built locally* * SDL2 * FreeType @@ -18,7 +18,7 @@ Cave Story Engine 2 is a decompilation of Cave Story, ported from DirectX to SDL This project primarily uses CMake, allowing it to be built with a range of compilers. -In this directory, create a directory called 'build', then switch to the command-line (Visual Studio users should open the [Developer Command Prompt](https://docs.microsoft.com/en-us/dotnet/framework/tools/developer-command-prompt-for-vs)) and `cd` into it. After that, generate the files for your build system with: +In this folder, create another folder called 'build', then switch to the command-line (Visual Studio users should open the [Developer Command Prompt](https://docs.microsoft.com/en-us/dotnet/framework/tools/developer-command-prompt-for-vs)) and `cd` into it. After that, generate the files for your build system with: ``` cmake .. -DCMAKE_BUILD_TYPE=Release @@ -38,13 +38,13 @@ cmake --build . --config Release If you're a Visual Studio user, you can open the generated `CSE2.sln` file instead. -Once built, the executables can be found in `build_en` or `build_jp`, depending on the selected language. +Once built, the executables and assets can be found in the newly-generated `game` folder. ### Makefile (deprecated) *Note: this requires pkg-config* -Run 'make' in the base directory, preferably with some of the following settings: +Run 'make' in this folder, preferably with some of the following settings: * `RELEASE=1` - Compile a release build (optimised, stripped, etc.) * `STATIC=1` - Produce a statically-linked executable (good for Windows builds, so you don't need to bundle DLL files) @@ -56,7 +56,7 @@ Run 'make' in the base directory, preferably with some of the following settings ### Visual Studio .NET 2003 -Project files for Visual Studio .NET 2003 are available in the 'msvc2003' directory. +Project files for Visual Studio .NET 2003 are available in the 'msvc2003' folder. Visual Studio .NET 2003 was used by Pixel to create the original `Doukutsu.exe`, so these project files allow us to check the accuracy of the decompilation by comparing the generated assembly code to that of the original executable. diff --git a/build_en/data/Arms.pbm b/assets/data_en/Arms.pbm similarity index 100% rename from build_en/data/Arms.pbm rename to assets/data_en/Arms.pbm diff --git a/build_en/data/ArmsImage.pbm b/assets/data_en/ArmsImage.pbm similarity index 100% rename from build_en/data/ArmsImage.pbm rename to assets/data_en/ArmsImage.pbm diff --git a/build_en/data/ArmsItem.tsc b/assets/data_en/ArmsItem.tsc similarity index 100% rename from build_en/data/ArmsItem.tsc rename to assets/data_en/ArmsItem.tsc diff --git a/build_en/data/Bullet.pbm b/assets/data_en/Bullet.pbm similarity index 100% rename from build_en/data/Bullet.pbm rename to assets/data_en/Bullet.pbm diff --git a/build_en/data/Caret.pbm b/assets/data_en/Caret.pbm similarity index 100% rename from build_en/data/Caret.pbm rename to assets/data_en/Caret.pbm diff --git a/build_en/data/Credit.tsc b/assets/data_en/Credit.tsc similarity index 100% rename from build_en/data/Credit.tsc rename to assets/data_en/Credit.tsc diff --git a/build_en/data/Face.pbm b/assets/data_en/Face.pbm similarity index 100% rename from build_en/data/Face.pbm rename to assets/data_en/Face.pbm diff --git a/build_en/data/Fade.pbm b/assets/data_en/Fade.pbm similarity index 100% rename from build_en/data/Fade.pbm rename to assets/data_en/Fade.pbm diff --git a/build_en/data/Head.tsc b/assets/data_en/Head.tsc similarity index 100% rename from build_en/data/Head.tsc rename to assets/data_en/Head.tsc diff --git a/build_en/data/ItemImage.pbm b/assets/data_en/ItemImage.pbm similarity index 100% rename from build_en/data/ItemImage.pbm rename to assets/data_en/ItemImage.pbm diff --git a/build_en/data/Loading.pbm b/assets/data_en/Loading.pbm similarity index 100% rename from build_en/data/Loading.pbm rename to assets/data_en/Loading.pbm diff --git a/build_en/data/MyChar.pbm b/assets/data_en/MyChar.pbm similarity index 100% rename from build_en/data/MyChar.pbm rename to assets/data_en/MyChar.pbm diff --git a/build_en/data/Npc/Npc0.pbm b/assets/data_en/Npc/Npc0.pbm similarity index 100% rename from build_en/data/Npc/Npc0.pbm rename to assets/data_en/Npc/Npc0.pbm diff --git a/build_en/data/Npc/NpcAlmo1.pbm b/assets/data_en/Npc/NpcAlmo1.pbm similarity index 100% rename from build_en/data/Npc/NpcAlmo1.pbm rename to assets/data_en/Npc/NpcAlmo1.pbm diff --git a/build_en/data/Npc/NpcAlmo2.pbm b/assets/data_en/Npc/NpcAlmo2.pbm similarity index 100% rename from build_en/data/Npc/NpcAlmo2.pbm rename to assets/data_en/Npc/NpcAlmo2.pbm diff --git a/build_en/data/Npc/NpcBallos.pbm b/assets/data_en/Npc/NpcBallos.pbm similarity index 100% rename from build_en/data/Npc/NpcBallos.pbm rename to assets/data_en/Npc/NpcBallos.pbm diff --git a/build_en/data/Npc/NpcBllg.pbm b/assets/data_en/Npc/NpcBllg.pbm similarity index 100% rename from build_en/data/Npc/NpcBllg.pbm rename to assets/data_en/Npc/NpcBllg.pbm diff --git a/build_en/data/Npc/NpcCemet.pbm b/assets/data_en/Npc/NpcCemet.pbm similarity index 100% rename from build_en/data/Npc/NpcCemet.pbm rename to assets/data_en/Npc/NpcCemet.pbm diff --git a/build_en/data/Npc/NpcCent.pbm b/assets/data_en/Npc/NpcCent.pbm similarity index 100% rename from build_en/data/Npc/NpcCent.pbm rename to assets/data_en/Npc/NpcCent.pbm diff --git a/build_en/data/Npc/NpcCurly.pbm b/assets/data_en/Npc/NpcCurly.pbm similarity index 100% rename from build_en/data/Npc/NpcCurly.pbm rename to assets/data_en/Npc/NpcCurly.pbm diff --git a/build_en/data/Npc/NpcDark.pbm b/assets/data_en/Npc/NpcDark.pbm similarity index 100% rename from build_en/data/Npc/NpcDark.pbm rename to assets/data_en/Npc/NpcDark.pbm diff --git a/build_en/data/Npc/NpcDr.pbm b/assets/data_en/Npc/NpcDr.pbm similarity index 100% rename from build_en/data/Npc/NpcDr.pbm rename to assets/data_en/Npc/NpcDr.pbm diff --git a/build_en/data/Npc/NpcEggs1.pbm b/assets/data_en/Npc/NpcEggs1.pbm similarity index 100% rename from build_en/data/Npc/NpcEggs1.pbm rename to assets/data_en/Npc/NpcEggs1.pbm diff --git a/build_en/data/Npc/NpcEggs2.pbm b/assets/data_en/Npc/NpcEggs2.pbm similarity index 100% rename from build_en/data/Npc/NpcEggs2.pbm rename to assets/data_en/Npc/NpcEggs2.pbm diff --git a/build_en/data/Npc/NpcFrog.pbm b/assets/data_en/Npc/NpcFrog.pbm similarity index 100% rename from build_en/data/Npc/NpcFrog.pbm rename to assets/data_en/Npc/NpcFrog.pbm diff --git a/build_en/data/Npc/NpcGuest.pbm b/assets/data_en/Npc/NpcGuest.pbm similarity index 100% rename from build_en/data/Npc/NpcGuest.pbm rename to assets/data_en/Npc/NpcGuest.pbm diff --git a/build_en/data/Npc/NpcHell.pbm b/assets/data_en/Npc/NpcHell.pbm similarity index 100% rename from build_en/data/Npc/NpcHell.pbm rename to assets/data_en/Npc/NpcHell.pbm diff --git a/build_en/data/Npc/NpcHeri.pbm b/assets/data_en/Npc/NpcHeri.pbm similarity index 100% rename from build_en/data/Npc/NpcHeri.pbm rename to assets/data_en/Npc/NpcHeri.pbm diff --git a/build_en/data/Npc/NpcIronH.pbm b/assets/data_en/Npc/NpcIronH.pbm similarity index 100% rename from build_en/data/Npc/NpcIronH.pbm rename to assets/data_en/Npc/NpcIronH.pbm diff --git a/build_en/data/Npc/NpcIsland.pbm b/assets/data_en/Npc/NpcIsland.pbm similarity index 100% rename from build_en/data/Npc/NpcIsland.pbm rename to assets/data_en/Npc/NpcIsland.pbm diff --git a/build_en/data/Npc/NpcKings.pbm b/assets/data_en/Npc/NpcKings.pbm similarity index 100% rename from build_en/data/Npc/NpcKings.pbm rename to assets/data_en/Npc/NpcKings.pbm diff --git a/build_en/data/Npc/NpcMaze.pbm b/assets/data_en/Npc/NpcMaze.pbm similarity index 100% rename from build_en/data/Npc/NpcMaze.pbm rename to assets/data_en/Npc/NpcMaze.pbm diff --git a/build_en/data/Npc/NpcMiza.pbm b/assets/data_en/Npc/NpcMiza.pbm similarity index 100% rename from build_en/data/Npc/NpcMiza.pbm rename to assets/data_en/Npc/NpcMiza.pbm diff --git a/build_en/data/Npc/NpcMoon.pbm b/assets/data_en/Npc/NpcMoon.pbm similarity index 100% rename from build_en/data/Npc/NpcMoon.pbm rename to assets/data_en/Npc/NpcMoon.pbm diff --git a/build_en/data/Npc/NpcOmg.pbm b/assets/data_en/Npc/NpcOmg.pbm similarity index 100% rename from build_en/data/Npc/NpcOmg.pbm rename to assets/data_en/Npc/NpcOmg.pbm diff --git a/build_en/data/Npc/NpcPlant.pbm b/assets/data_en/Npc/NpcPlant.pbm similarity index 100% rename from build_en/data/Npc/NpcPlant.pbm rename to assets/data_en/Npc/NpcPlant.pbm diff --git a/build_en/data/Npc/NpcPress.pbm b/assets/data_en/Npc/NpcPress.pbm similarity index 100% rename from build_en/data/Npc/NpcPress.pbm rename to assets/data_en/Npc/NpcPress.pbm diff --git a/build_en/data/Npc/NpcPriest.pbm b/assets/data_en/Npc/NpcPriest.pbm similarity index 100% rename from build_en/data/Npc/NpcPriest.pbm rename to assets/data_en/Npc/NpcPriest.pbm diff --git a/build_en/data/Npc/NpcRavil.pbm b/assets/data_en/Npc/NpcRavil.pbm similarity index 100% rename from build_en/data/Npc/NpcRavil.pbm rename to assets/data_en/Npc/NpcRavil.pbm diff --git a/build_en/data/Npc/NpcRed.pbm b/assets/data_en/Npc/NpcRed.pbm similarity index 100% rename from build_en/data/Npc/NpcRed.pbm rename to assets/data_en/Npc/NpcRed.pbm diff --git a/build_en/data/Npc/NpcRegu.pbm b/assets/data_en/Npc/NpcRegu.pbm similarity index 100% rename from build_en/data/Npc/NpcRegu.pbm rename to assets/data_en/Npc/NpcRegu.pbm diff --git a/build_en/data/Npc/NpcSand.pbm b/assets/data_en/Npc/NpcSand.pbm similarity index 100% rename from build_en/data/Npc/NpcSand.pbm rename to assets/data_en/Npc/NpcSand.pbm diff --git a/build_en/data/Npc/NpcStream.pbm b/assets/data_en/Npc/NpcStream.pbm similarity index 100% rename from build_en/data/Npc/NpcStream.pbm rename to assets/data_en/Npc/NpcStream.pbm diff --git a/build_en/data/Npc/NpcSym.pbm b/assets/data_en/Npc/NpcSym.pbm similarity index 100% rename from build_en/data/Npc/NpcSym.pbm rename to assets/data_en/Npc/NpcSym.pbm diff --git a/build_en/data/Npc/NpcToro.pbm b/assets/data_en/Npc/NpcToro.pbm similarity index 100% rename from build_en/data/Npc/NpcToro.pbm rename to assets/data_en/Npc/NpcToro.pbm diff --git a/build_en/data/Npc/NpcTwinD.pbm b/assets/data_en/Npc/NpcTwinD.pbm similarity index 100% rename from build_en/data/Npc/NpcTwinD.pbm rename to assets/data_en/Npc/NpcTwinD.pbm diff --git a/build_en/data/Npc/NpcWeed.pbm b/assets/data_en/Npc/NpcWeed.pbm similarity index 100% rename from build_en/data/Npc/NpcWeed.pbm rename to assets/data_en/Npc/NpcWeed.pbm diff --git a/build_en/data/Npc/NpcX.pbm b/assets/data_en/Npc/NpcX.pbm similarity index 100% rename from build_en/data/Npc/NpcX.pbm rename to assets/data_en/Npc/NpcX.pbm diff --git a/build_en/data/Stage/0.pxa b/assets/data_en/Stage/0.pxa similarity index 100% rename from build_en/data/Stage/0.pxa rename to assets/data_en/Stage/0.pxa diff --git a/build_en/data/Stage/0.pxe b/assets/data_en/Stage/0.pxe similarity index 100% rename from build_en/data/Stage/0.pxe rename to assets/data_en/Stage/0.pxe diff --git a/build_en/data/Stage/0.pxm b/assets/data_en/Stage/0.pxm similarity index 100% rename from build_en/data/Stage/0.pxm rename to assets/data_en/Stage/0.pxm diff --git a/build_en/data/Stage/0.tsc b/assets/data_en/Stage/0.tsc similarity index 100% rename from build_en/data/Stage/0.tsc rename to assets/data_en/Stage/0.tsc diff --git a/build_en/data/Stage/555.pxe b/assets/data_en/Stage/555.pxe similarity index 100% rename from build_en/data/Stage/555.pxe rename to assets/data_en/Stage/555.pxe diff --git a/build_en/data/Stage/Almond.pxa b/assets/data_en/Stage/Almond.pxa similarity index 100% rename from build_en/data/Stage/Almond.pxa rename to assets/data_en/Stage/Almond.pxa diff --git a/build_en/data/Stage/Almond.pxe b/assets/data_en/Stage/Almond.pxe similarity index 100% rename from build_en/data/Stage/Almond.pxe rename to assets/data_en/Stage/Almond.pxe diff --git a/build_en/data/Stage/Almond.pxm b/assets/data_en/Stage/Almond.pxm similarity index 100% rename from build_en/data/Stage/Almond.pxm rename to assets/data_en/Stage/Almond.pxm diff --git a/build_en/data/Stage/Almond.tsc b/assets/data_en/Stage/Almond.tsc similarity index 100% rename from build_en/data/Stage/Almond.tsc rename to assets/data_en/Stage/Almond.tsc diff --git a/build_en/data/Stage/Ballo1.pxe b/assets/data_en/Stage/Ballo1.pxe similarity index 100% rename from build_en/data/Stage/Ballo1.pxe rename to assets/data_en/Stage/Ballo1.pxe diff --git a/build_en/data/Stage/Ballo1.pxm b/assets/data_en/Stage/Ballo1.pxm similarity index 100% rename from build_en/data/Stage/Ballo1.pxm rename to assets/data_en/Stage/Ballo1.pxm diff --git a/build_en/data/Stage/Ballo1.tsc b/assets/data_en/Stage/Ballo1.tsc similarity index 100% rename from build_en/data/Stage/Ballo1.tsc rename to assets/data_en/Stage/Ballo1.tsc diff --git a/build_en/data/Stage/Ballo2.pxe b/assets/data_en/Stage/Ballo2.pxe similarity index 100% rename from build_en/data/Stage/Ballo2.pxe rename to assets/data_en/Stage/Ballo2.pxe diff --git a/build_en/data/Stage/Ballo2.pxm b/assets/data_en/Stage/Ballo2.pxm similarity index 100% rename from build_en/data/Stage/Ballo2.pxm rename to assets/data_en/Stage/Ballo2.pxm diff --git a/build_en/data/Stage/Ballo2.tsc b/assets/data_en/Stage/Ballo2.tsc similarity index 100% rename from build_en/data/Stage/Ballo2.tsc rename to assets/data_en/Stage/Ballo2.tsc diff --git a/build_en/data/Stage/Barr.pxa b/assets/data_en/Stage/Barr.pxa similarity index 100% rename from build_en/data/Stage/Barr.pxa rename to assets/data_en/Stage/Barr.pxa diff --git a/build_en/data/Stage/Barr.pxe b/assets/data_en/Stage/Barr.pxe similarity index 100% rename from build_en/data/Stage/Barr.pxe rename to assets/data_en/Stage/Barr.pxe diff --git a/build_en/data/Stage/Barr.pxm b/assets/data_en/Stage/Barr.pxm similarity index 100% rename from build_en/data/Stage/Barr.pxm rename to assets/data_en/Stage/Barr.pxm diff --git a/build_en/data/Stage/Barr.tsc b/assets/data_en/Stage/Barr.tsc similarity index 100% rename from build_en/data/Stage/Barr.tsc rename to assets/data_en/Stage/Barr.tsc diff --git a/build_en/data/Stage/Blcny1.pxe b/assets/data_en/Stage/Blcny1.pxe similarity index 100% rename from build_en/data/Stage/Blcny1.pxe rename to assets/data_en/Stage/Blcny1.pxe diff --git a/build_en/data/Stage/Blcny1.pxm b/assets/data_en/Stage/Blcny1.pxm similarity index 100% rename from build_en/data/Stage/Blcny1.pxm rename to assets/data_en/Stage/Blcny1.pxm diff --git a/build_en/data/Stage/Blcny1.tsc b/assets/data_en/Stage/Blcny1.tsc similarity index 100% rename from build_en/data/Stage/Blcny1.tsc rename to assets/data_en/Stage/Blcny1.tsc diff --git a/build_en/data/Stage/Blcny2.pxe b/assets/data_en/Stage/Blcny2.pxe similarity index 100% rename from build_en/data/Stage/Blcny2.pxe rename to assets/data_en/Stage/Blcny2.pxe diff --git a/build_en/data/Stage/Blcny2.pxm b/assets/data_en/Stage/Blcny2.pxm similarity index 100% rename from build_en/data/Stage/Blcny2.pxm rename to assets/data_en/Stage/Blcny2.pxm diff --git a/build_en/data/Stage/Blcny2.tsc b/assets/data_en/Stage/Blcny2.tsc similarity index 100% rename from build_en/data/Stage/Blcny2.tsc rename to assets/data_en/Stage/Blcny2.tsc diff --git a/build_en/data/Stage/Cave.pxa b/assets/data_en/Stage/Cave.pxa similarity index 100% rename from build_en/data/Stage/Cave.pxa rename to assets/data_en/Stage/Cave.pxa diff --git a/build_en/data/Stage/Cave.pxe b/assets/data_en/Stage/Cave.pxe similarity index 100% rename from build_en/data/Stage/Cave.pxe rename to assets/data_en/Stage/Cave.pxe diff --git a/build_en/data/Stage/Cave.pxm b/assets/data_en/Stage/Cave.pxm similarity index 100% rename from build_en/data/Stage/Cave.pxm rename to assets/data_en/Stage/Cave.pxm diff --git a/build_en/data/Stage/Cave.tsc b/assets/data_en/Stage/Cave.tsc similarity index 100% rename from build_en/data/Stage/Cave.tsc rename to assets/data_en/Stage/Cave.tsc diff --git a/build_en/data/Stage/Cemet.pxe b/assets/data_en/Stage/Cemet.pxe similarity index 100% rename from build_en/data/Stage/Cemet.pxe rename to assets/data_en/Stage/Cemet.pxe diff --git a/build_en/data/Stage/Cemet.pxm b/assets/data_en/Stage/Cemet.pxm similarity index 100% rename from build_en/data/Stage/Cemet.pxm rename to assets/data_en/Stage/Cemet.pxm diff --git a/build_en/data/Stage/Cemet.tsc b/assets/data_en/Stage/Cemet.tsc similarity index 100% rename from build_en/data/Stage/Cemet.tsc rename to assets/data_en/Stage/Cemet.tsc diff --git a/build_en/data/Stage/Cent.pxa b/assets/data_en/Stage/Cent.pxa similarity index 100% rename from build_en/data/Stage/Cent.pxa rename to assets/data_en/Stage/Cent.pxa diff --git a/build_en/data/Stage/Cent.pxe b/assets/data_en/Stage/Cent.pxe similarity index 100% rename from build_en/data/Stage/Cent.pxe rename to assets/data_en/Stage/Cent.pxe diff --git a/build_en/data/Stage/Cent.pxm b/assets/data_en/Stage/Cent.pxm similarity index 100% rename from build_en/data/Stage/Cent.pxm rename to assets/data_en/Stage/Cent.pxm diff --git a/build_en/data/Stage/Cent.tsc b/assets/data_en/Stage/Cent.tsc similarity index 100% rename from build_en/data/Stage/Cent.tsc rename to assets/data_en/Stage/Cent.tsc diff --git a/build_en/data/Stage/CentW.pxe b/assets/data_en/Stage/CentW.pxe similarity index 100% rename from build_en/data/Stage/CentW.pxe rename to assets/data_en/Stage/CentW.pxe diff --git a/build_en/data/Stage/CentW.pxm b/assets/data_en/Stage/CentW.pxm similarity index 100% rename from build_en/data/Stage/CentW.pxm rename to assets/data_en/Stage/CentW.pxm diff --git a/build_en/data/Stage/CentW.tsc b/assets/data_en/Stage/CentW.tsc similarity index 100% rename from build_en/data/Stage/CentW.tsc rename to assets/data_en/Stage/CentW.tsc diff --git a/build_en/data/Stage/Chako.pxe b/assets/data_en/Stage/Chako.pxe similarity index 100% rename from build_en/data/Stage/Chako.pxe rename to assets/data_en/Stage/Chako.pxe diff --git a/build_en/data/Stage/Chako.pxm b/assets/data_en/Stage/Chako.pxm similarity index 100% rename from build_en/data/Stage/Chako.pxm rename to assets/data_en/Stage/Chako.pxm diff --git a/build_en/data/Stage/Chako.tsc b/assets/data_en/Stage/Chako.tsc similarity index 100% rename from build_en/data/Stage/Chako.tsc rename to assets/data_en/Stage/Chako.tsc diff --git a/build_en/data/Stage/Clock.pxe b/assets/data_en/Stage/Clock.pxe similarity index 100% rename from build_en/data/Stage/Clock.pxe rename to assets/data_en/Stage/Clock.pxe diff --git a/build_en/data/Stage/Clock.pxm b/assets/data_en/Stage/Clock.pxm similarity index 100% rename from build_en/data/Stage/Clock.pxm rename to assets/data_en/Stage/Clock.pxm diff --git a/build_en/data/Stage/Clock.tsc b/assets/data_en/Stage/Clock.tsc similarity index 100% rename from build_en/data/Stage/Clock.tsc rename to assets/data_en/Stage/Clock.tsc diff --git a/build_en/data/Stage/Comu.pxe b/assets/data_en/Stage/Comu.pxe similarity index 100% rename from build_en/data/Stage/Comu.pxe rename to assets/data_en/Stage/Comu.pxe diff --git a/build_en/data/Stage/Comu.pxm b/assets/data_en/Stage/Comu.pxm similarity index 100% rename from build_en/data/Stage/Comu.pxm rename to assets/data_en/Stage/Comu.pxm diff --git a/build_en/data/Stage/Comu.tsc b/assets/data_en/Stage/Comu.tsc similarity index 100% rename from build_en/data/Stage/Comu.tsc rename to assets/data_en/Stage/Comu.tsc diff --git a/build_en/data/Stage/Cook.pxm b/assets/data_en/Stage/Cook.pxm similarity index 100% rename from build_en/data/Stage/Cook.pxm rename to assets/data_en/Stage/Cook.pxm diff --git a/build_en/data/Stage/Cthu.pxe b/assets/data_en/Stage/Cthu.pxe similarity index 100% rename from build_en/data/Stage/Cthu.pxe rename to assets/data_en/Stage/Cthu.pxe diff --git a/build_en/data/Stage/Cthu.pxm b/assets/data_en/Stage/Cthu.pxm similarity index 100% rename from build_en/data/Stage/Cthu.pxm rename to assets/data_en/Stage/Cthu.pxm diff --git a/build_en/data/Stage/Cthu.tsc b/assets/data_en/Stage/Cthu.tsc similarity index 100% rename from build_en/data/Stage/Cthu.tsc rename to assets/data_en/Stage/Cthu.tsc diff --git a/build_en/data/Stage/Cthu2.pxe b/assets/data_en/Stage/Cthu2.pxe similarity index 100% rename from build_en/data/Stage/Cthu2.pxe rename to assets/data_en/Stage/Cthu2.pxe diff --git a/build_en/data/Stage/Cthu2.pxm b/assets/data_en/Stage/Cthu2.pxm similarity index 100% rename from build_en/data/Stage/Cthu2.pxm rename to assets/data_en/Stage/Cthu2.pxm diff --git a/build_en/data/Stage/Cthu2.tsc b/assets/data_en/Stage/Cthu2.tsc similarity index 100% rename from build_en/data/Stage/Cthu2.tsc rename to assets/data_en/Stage/Cthu2.tsc diff --git a/build_en/data/Stage/Curly.pxe b/assets/data_en/Stage/Curly.pxe similarity index 100% rename from build_en/data/Stage/Curly.pxe rename to assets/data_en/Stage/Curly.pxe diff --git a/build_en/data/Stage/Curly.pxm b/assets/data_en/Stage/Curly.pxm similarity index 100% rename from build_en/data/Stage/Curly.pxm rename to assets/data_en/Stage/Curly.pxm diff --git a/build_en/data/Stage/Curly.tsc b/assets/data_en/Stage/Curly.tsc similarity index 100% rename from build_en/data/Stage/Curly.tsc rename to assets/data_en/Stage/Curly.tsc diff --git a/build_en/data/Stage/CurlyS.pxe b/assets/data_en/Stage/CurlyS.pxe similarity index 100% rename from build_en/data/Stage/CurlyS.pxe rename to assets/data_en/Stage/CurlyS.pxe diff --git a/build_en/data/Stage/CurlyS.pxm b/assets/data_en/Stage/CurlyS.pxm similarity index 100% rename from build_en/data/Stage/CurlyS.pxm rename to assets/data_en/Stage/CurlyS.pxm diff --git a/build_en/data/Stage/CurlyS.tsc b/assets/data_en/Stage/CurlyS.tsc similarity index 100% rename from build_en/data/Stage/CurlyS.tsc rename to assets/data_en/Stage/CurlyS.tsc diff --git a/build_en/data/Stage/Dark.pxe b/assets/data_en/Stage/Dark.pxe similarity index 100% rename from build_en/data/Stage/Dark.pxe rename to assets/data_en/Stage/Dark.pxe diff --git a/build_en/data/Stage/Dark.pxm b/assets/data_en/Stage/Dark.pxm similarity index 100% rename from build_en/data/Stage/Dark.pxm rename to assets/data_en/Stage/Dark.pxm diff --git a/build_en/data/Stage/Dark.tsc b/assets/data_en/Stage/Dark.tsc similarity index 100% rename from build_en/data/Stage/Dark.tsc rename to assets/data_en/Stage/Dark.tsc diff --git a/build_en/data/Stage/Drain.pxe b/assets/data_en/Stage/Drain.pxe similarity index 100% rename from build_en/data/Stage/Drain.pxe rename to assets/data_en/Stage/Drain.pxe diff --git a/build_en/data/Stage/Drain.pxm b/assets/data_en/Stage/Drain.pxm similarity index 100% rename from build_en/data/Stage/Drain.pxm rename to assets/data_en/Stage/Drain.pxm diff --git a/build_en/data/Stage/Drain.tsc b/assets/data_en/Stage/Drain.tsc similarity index 100% rename from build_en/data/Stage/Drain.tsc rename to assets/data_en/Stage/Drain.tsc diff --git a/build_en/data/Stage/EgEnd1.pxe b/assets/data_en/Stage/EgEnd1.pxe similarity index 100% rename from build_en/data/Stage/EgEnd1.pxe rename to assets/data_en/Stage/EgEnd1.pxe diff --git a/build_en/data/Stage/EgEnd1.pxm b/assets/data_en/Stage/EgEnd1.pxm similarity index 100% rename from build_en/data/Stage/EgEnd1.pxm rename to assets/data_en/Stage/EgEnd1.pxm diff --git a/build_en/data/Stage/EgEnd1.tsc b/assets/data_en/Stage/EgEnd1.tsc similarity index 100% rename from build_en/data/Stage/EgEnd1.tsc rename to assets/data_en/Stage/EgEnd1.tsc diff --git a/build_en/data/Stage/EgEnd2.pxe b/assets/data_en/Stage/EgEnd2.pxe similarity index 100% rename from build_en/data/Stage/EgEnd2.pxe rename to assets/data_en/Stage/EgEnd2.pxe diff --git a/build_en/data/Stage/EgEnd2.pxm b/assets/data_en/Stage/EgEnd2.pxm similarity index 100% rename from build_en/data/Stage/EgEnd2.pxm rename to assets/data_en/Stage/EgEnd2.pxm diff --git a/build_en/data/Stage/EgEnd2.tsc b/assets/data_en/Stage/EgEnd2.tsc similarity index 100% rename from build_en/data/Stage/EgEnd2.tsc rename to assets/data_en/Stage/EgEnd2.tsc diff --git a/build_en/data/Stage/Egg1.pxe b/assets/data_en/Stage/Egg1.pxe similarity index 100% rename from build_en/data/Stage/Egg1.pxe rename to assets/data_en/Stage/Egg1.pxe diff --git a/build_en/data/Stage/Egg1.pxm b/assets/data_en/Stage/Egg1.pxm similarity index 100% rename from build_en/data/Stage/Egg1.pxm rename to assets/data_en/Stage/Egg1.pxm diff --git a/build_en/data/Stage/Egg1.tsc b/assets/data_en/Stage/Egg1.tsc similarity index 100% rename from build_en/data/Stage/Egg1.tsc rename to assets/data_en/Stage/Egg1.tsc diff --git a/build_en/data/Stage/Egg6.pxe b/assets/data_en/Stage/Egg6.pxe similarity index 100% rename from build_en/data/Stage/Egg6.pxe rename to assets/data_en/Stage/Egg6.pxe diff --git a/build_en/data/Stage/Egg6.pxm b/assets/data_en/Stage/Egg6.pxm similarity index 100% rename from build_en/data/Stage/Egg6.pxm rename to assets/data_en/Stage/Egg6.pxm diff --git a/build_en/data/Stage/Egg6.tsc b/assets/data_en/Stage/Egg6.tsc similarity index 100% rename from build_en/data/Stage/Egg6.tsc rename to assets/data_en/Stage/Egg6.tsc diff --git a/build_en/data/Stage/EggIn.pxa b/assets/data_en/Stage/EggIn.pxa similarity index 100% rename from build_en/data/Stage/EggIn.pxa rename to assets/data_en/Stage/EggIn.pxa diff --git a/build_en/data/Stage/EggR.pxe b/assets/data_en/Stage/EggR.pxe similarity index 100% rename from build_en/data/Stage/EggR.pxe rename to assets/data_en/Stage/EggR.pxe diff --git a/build_en/data/Stage/EggR.pxm b/assets/data_en/Stage/EggR.pxm similarity index 100% rename from build_en/data/Stage/EggR.pxm rename to assets/data_en/Stage/EggR.pxm diff --git a/build_en/data/Stage/EggR.tsc b/assets/data_en/Stage/EggR.tsc similarity index 100% rename from build_en/data/Stage/EggR.tsc rename to assets/data_en/Stage/EggR.tsc diff --git a/build_en/data/Stage/EggR2.pxe b/assets/data_en/Stage/EggR2.pxe similarity index 100% rename from build_en/data/Stage/EggR2.pxe rename to assets/data_en/Stage/EggR2.pxe diff --git a/build_en/data/Stage/EggR2.pxm b/assets/data_en/Stage/EggR2.pxm similarity index 100% rename from build_en/data/Stage/EggR2.pxm rename to assets/data_en/Stage/EggR2.pxm diff --git a/build_en/data/Stage/EggR2.tsc b/assets/data_en/Stage/EggR2.tsc similarity index 100% rename from build_en/data/Stage/EggR2.tsc rename to assets/data_en/Stage/EggR2.tsc diff --git a/build_en/data/Stage/EggX.pxa b/assets/data_en/Stage/EggX.pxa similarity index 100% rename from build_en/data/Stage/EggX.pxa rename to assets/data_en/Stage/EggX.pxa diff --git a/build_en/data/Stage/EggX.pxe b/assets/data_en/Stage/EggX.pxe similarity index 100% rename from build_en/data/Stage/EggX.pxe rename to assets/data_en/Stage/EggX.pxe diff --git a/build_en/data/Stage/EggX.pxm b/assets/data_en/Stage/EggX.pxm similarity index 100% rename from build_en/data/Stage/EggX.pxm rename to assets/data_en/Stage/EggX.pxm diff --git a/build_en/data/Stage/EggX.tsc b/assets/data_en/Stage/EggX.tsc similarity index 100% rename from build_en/data/Stage/EggX.tsc rename to assets/data_en/Stage/EggX.tsc diff --git a/build_en/data/Stage/EggX2.pxe b/assets/data_en/Stage/EggX2.pxe similarity index 100% rename from build_en/data/Stage/EggX2.pxe rename to assets/data_en/Stage/EggX2.pxe diff --git a/build_en/data/Stage/EggX2.pxm b/assets/data_en/Stage/EggX2.pxm similarity index 100% rename from build_en/data/Stage/EggX2.pxm rename to assets/data_en/Stage/EggX2.pxm diff --git a/build_en/data/Stage/EggX2.tsc b/assets/data_en/Stage/EggX2.tsc similarity index 100% rename from build_en/data/Stage/EggX2.tsc rename to assets/data_en/Stage/EggX2.tsc diff --git a/build_en/data/Stage/Eggs.pxa b/assets/data_en/Stage/Eggs.pxa similarity index 100% rename from build_en/data/Stage/Eggs.pxa rename to assets/data_en/Stage/Eggs.pxa diff --git a/build_en/data/Stage/Eggs.pxe b/assets/data_en/Stage/Eggs.pxe similarity index 100% rename from build_en/data/Stage/Eggs.pxe rename to assets/data_en/Stage/Eggs.pxe diff --git a/build_en/data/Stage/Eggs.pxm b/assets/data_en/Stage/Eggs.pxm similarity index 100% rename from build_en/data/Stage/Eggs.pxm rename to assets/data_en/Stage/Eggs.pxm diff --git a/build_en/data/Stage/Eggs.tsc b/assets/data_en/Stage/Eggs.tsc similarity index 100% rename from build_en/data/Stage/Eggs.tsc rename to assets/data_en/Stage/Eggs.tsc diff --git a/build_en/data/Stage/Eggs2.pxe b/assets/data_en/Stage/Eggs2.pxe similarity index 100% rename from build_en/data/Stage/Eggs2.pxe rename to assets/data_en/Stage/Eggs2.pxe diff --git a/build_en/data/Stage/Eggs2.pxm b/assets/data_en/Stage/Eggs2.pxm similarity index 100% rename from build_en/data/Stage/Eggs2.pxm rename to assets/data_en/Stage/Eggs2.pxm diff --git a/build_en/data/Stage/Eggs2.tsc b/assets/data_en/Stage/Eggs2.tsc similarity index 100% rename from build_en/data/Stage/Eggs2.tsc rename to assets/data_en/Stage/Eggs2.tsc diff --git a/build_en/data/Stage/Fall.pxa b/assets/data_en/Stage/Fall.pxa similarity index 100% rename from build_en/data/Stage/Fall.pxa rename to assets/data_en/Stage/Fall.pxa diff --git a/build_en/data/Stage/Fall.pxe b/assets/data_en/Stage/Fall.pxe similarity index 100% rename from build_en/data/Stage/Fall.pxe rename to assets/data_en/Stage/Fall.pxe diff --git a/build_en/data/Stage/Fall.pxm b/assets/data_en/Stage/Fall.pxm similarity index 100% rename from build_en/data/Stage/Fall.pxm rename to assets/data_en/Stage/Fall.pxm diff --git a/build_en/data/Stage/Fall.tsc b/assets/data_en/Stage/Fall.tsc similarity index 100% rename from build_en/data/Stage/Fall.tsc rename to assets/data_en/Stage/Fall.tsc diff --git a/build_en/data/Stage/Frog.pxe b/assets/data_en/Stage/Frog.pxe similarity index 100% rename from build_en/data/Stage/Frog.pxe rename to assets/data_en/Stage/Frog.pxe diff --git a/build_en/data/Stage/Frog.pxm b/assets/data_en/Stage/Frog.pxm similarity index 100% rename from build_en/data/Stage/Frog.pxm rename to assets/data_en/Stage/Frog.pxm diff --git a/build_en/data/Stage/Frog.tsc b/assets/data_en/Stage/Frog.tsc similarity index 100% rename from build_en/data/Stage/Frog.tsc rename to assets/data_en/Stage/Frog.tsc diff --git a/build_en/data/Stage/Gard.pxa b/assets/data_en/Stage/Gard.pxa similarity index 100% rename from build_en/data/Stage/Gard.pxa rename to assets/data_en/Stage/Gard.pxa diff --git a/build_en/data/Stage/Gard.pxe b/assets/data_en/Stage/Gard.pxe similarity index 100% rename from build_en/data/Stage/Gard.pxe rename to assets/data_en/Stage/Gard.pxe diff --git a/build_en/data/Stage/Gard.pxm b/assets/data_en/Stage/Gard.pxm similarity index 100% rename from build_en/data/Stage/Gard.pxm rename to assets/data_en/Stage/Gard.pxm diff --git a/build_en/data/Stage/Gard.tsc b/assets/data_en/Stage/Gard.tsc similarity index 100% rename from build_en/data/Stage/Gard.tsc rename to assets/data_en/Stage/Gard.tsc diff --git a/build_en/data/Stage/Hell.pxa b/assets/data_en/Stage/Hell.pxa similarity index 100% rename from build_en/data/Stage/Hell.pxa rename to assets/data_en/Stage/Hell.pxa diff --git a/build_en/data/Stage/Hell1.pxe b/assets/data_en/Stage/Hell1.pxe similarity index 100% rename from build_en/data/Stage/Hell1.pxe rename to assets/data_en/Stage/Hell1.pxe diff --git a/build_en/data/Stage/Hell1.pxm b/assets/data_en/Stage/Hell1.pxm similarity index 100% rename from build_en/data/Stage/Hell1.pxm rename to assets/data_en/Stage/Hell1.pxm diff --git a/build_en/data/Stage/Hell1.tsc b/assets/data_en/Stage/Hell1.tsc similarity index 100% rename from build_en/data/Stage/Hell1.tsc rename to assets/data_en/Stage/Hell1.tsc diff --git a/build_en/data/Stage/Hell2.pxe b/assets/data_en/Stage/Hell2.pxe similarity index 100% rename from build_en/data/Stage/Hell2.pxe rename to assets/data_en/Stage/Hell2.pxe diff --git a/build_en/data/Stage/Hell2.pxm b/assets/data_en/Stage/Hell2.pxm similarity index 100% rename from build_en/data/Stage/Hell2.pxm rename to assets/data_en/Stage/Hell2.pxm diff --git a/build_en/data/Stage/Hell2.tsc b/assets/data_en/Stage/Hell2.tsc similarity index 100% rename from build_en/data/Stage/Hell2.tsc rename to assets/data_en/Stage/Hell2.tsc diff --git a/build_en/data/Stage/Hell3.pxe b/assets/data_en/Stage/Hell3.pxe similarity index 100% rename from build_en/data/Stage/Hell3.pxe rename to assets/data_en/Stage/Hell3.pxe diff --git a/build_en/data/Stage/Hell3.pxm b/assets/data_en/Stage/Hell3.pxm similarity index 100% rename from build_en/data/Stage/Hell3.pxm rename to assets/data_en/Stage/Hell3.pxm diff --git a/build_en/data/Stage/Hell3.tsc b/assets/data_en/Stage/Hell3.tsc similarity index 100% rename from build_en/data/Stage/Hell3.tsc rename to assets/data_en/Stage/Hell3.tsc diff --git a/build_en/data/Stage/Hell4.pxe b/assets/data_en/Stage/Hell4.pxe similarity index 100% rename from build_en/data/Stage/Hell4.pxe rename to assets/data_en/Stage/Hell4.pxe diff --git a/build_en/data/Stage/Hell4.pxm b/assets/data_en/Stage/Hell4.pxm similarity index 100% rename from build_en/data/Stage/Hell4.pxm rename to assets/data_en/Stage/Hell4.pxm diff --git a/build_en/data/Stage/Hell4.tsc b/assets/data_en/Stage/Hell4.tsc similarity index 100% rename from build_en/data/Stage/Hell4.tsc rename to assets/data_en/Stage/Hell4.tsc diff --git a/build_en/data/Stage/Hell42.pxe b/assets/data_en/Stage/Hell42.pxe similarity index 100% rename from build_en/data/Stage/Hell42.pxe rename to assets/data_en/Stage/Hell42.pxe diff --git a/build_en/data/Stage/Hell42.pxm b/assets/data_en/Stage/Hell42.pxm similarity index 100% rename from build_en/data/Stage/Hell42.pxm rename to assets/data_en/Stage/Hell42.pxm diff --git a/build_en/data/Stage/Hell42.tsc b/assets/data_en/Stage/Hell42.tsc similarity index 100% rename from build_en/data/Stage/Hell42.tsc rename to assets/data_en/Stage/Hell42.tsc diff --git a/build_en/data/Stage/Island.pxe b/assets/data_en/Stage/Island.pxe similarity index 100% rename from build_en/data/Stage/Island.pxe rename to assets/data_en/Stage/Island.pxe diff --git a/build_en/data/Stage/Island.pxm b/assets/data_en/Stage/Island.pxm similarity index 100% rename from build_en/data/Stage/Island.pxm rename to assets/data_en/Stage/Island.pxm diff --git a/build_en/data/Stage/Island.tsc b/assets/data_en/Stage/Island.tsc similarity index 100% rename from build_en/data/Stage/Island.tsc rename to assets/data_en/Stage/Island.tsc diff --git a/build_en/data/Stage/Itoh.pxe b/assets/data_en/Stage/Itoh.pxe similarity index 100% rename from build_en/data/Stage/Itoh.pxe rename to assets/data_en/Stage/Itoh.pxe diff --git a/build_en/data/Stage/Itoh.pxm b/assets/data_en/Stage/Itoh.pxm similarity index 100% rename from build_en/data/Stage/Itoh.pxm rename to assets/data_en/Stage/Itoh.pxm diff --git a/build_en/data/Stage/Itoh.tsc b/assets/data_en/Stage/Itoh.tsc similarity index 100% rename from build_en/data/Stage/Itoh.tsc rename to assets/data_en/Stage/Itoh.tsc diff --git a/build_en/data/Stage/Jail.pxa b/assets/data_en/Stage/Jail.pxa similarity index 100% rename from build_en/data/Stage/Jail.pxa rename to assets/data_en/Stage/Jail.pxa diff --git a/build_en/data/Stage/Jail1.pxe b/assets/data_en/Stage/Jail1.pxe similarity index 100% rename from build_en/data/Stage/Jail1.pxe rename to assets/data_en/Stage/Jail1.pxe diff --git a/build_en/data/Stage/Jail1.pxm b/assets/data_en/Stage/Jail1.pxm similarity index 100% rename from build_en/data/Stage/Jail1.pxm rename to assets/data_en/Stage/Jail1.pxm diff --git a/build_en/data/Stage/Jail1.tsc b/assets/data_en/Stage/Jail1.tsc similarity index 100% rename from build_en/data/Stage/Jail1.tsc rename to assets/data_en/Stage/Jail1.tsc diff --git a/build_en/data/Stage/Jail2.pxe b/assets/data_en/Stage/Jail2.pxe similarity index 100% rename from build_en/data/Stage/Jail2.pxe rename to assets/data_en/Stage/Jail2.pxe diff --git a/build_en/data/Stage/Jail2.pxm b/assets/data_en/Stage/Jail2.pxm similarity index 100% rename from build_en/data/Stage/Jail2.pxm rename to assets/data_en/Stage/Jail2.pxm diff --git a/build_en/data/Stage/Jail2.tsc b/assets/data_en/Stage/Jail2.tsc similarity index 100% rename from build_en/data/Stage/Jail2.tsc rename to assets/data_en/Stage/Jail2.tsc diff --git a/build_en/data/Stage/Jenka1.pxe b/assets/data_en/Stage/Jenka1.pxe similarity index 100% rename from build_en/data/Stage/Jenka1.pxe rename to assets/data_en/Stage/Jenka1.pxe diff --git a/build_en/data/Stage/Jenka1.pxm b/assets/data_en/Stage/Jenka1.pxm similarity index 100% rename from build_en/data/Stage/Jenka1.pxm rename to assets/data_en/Stage/Jenka1.pxm diff --git a/build_en/data/Stage/Jenka1.tsc b/assets/data_en/Stage/Jenka1.tsc similarity index 100% rename from build_en/data/Stage/Jenka1.tsc rename to assets/data_en/Stage/Jenka1.tsc diff --git a/build_en/data/Stage/Jenka2.pxe b/assets/data_en/Stage/Jenka2.pxe similarity index 100% rename from build_en/data/Stage/Jenka2.pxe rename to assets/data_en/Stage/Jenka2.pxe diff --git a/build_en/data/Stage/Jenka2.pxm b/assets/data_en/Stage/Jenka2.pxm similarity index 100% rename from build_en/data/Stage/Jenka2.pxm rename to assets/data_en/Stage/Jenka2.pxm diff --git a/build_en/data/Stage/Jenka2.tsc b/assets/data_en/Stage/Jenka2.tsc similarity index 100% rename from build_en/data/Stage/Jenka2.tsc rename to assets/data_en/Stage/Jenka2.tsc diff --git a/build_en/data/Stage/Kings.pxe b/assets/data_en/Stage/Kings.pxe similarity index 100% rename from build_en/data/Stage/Kings.pxe rename to assets/data_en/Stage/Kings.pxe diff --git a/build_en/data/Stage/Kings.pxm b/assets/data_en/Stage/Kings.pxm similarity index 100% rename from build_en/data/Stage/Kings.pxm rename to assets/data_en/Stage/Kings.pxm diff --git a/build_en/data/Stage/Kings.tsc b/assets/data_en/Stage/Kings.tsc similarity index 100% rename from build_en/data/Stage/Kings.tsc rename to assets/data_en/Stage/Kings.tsc diff --git a/build_en/data/Stage/Labo.pxa b/assets/data_en/Stage/Labo.pxa similarity index 100% rename from build_en/data/Stage/Labo.pxa rename to assets/data_en/Stage/Labo.pxa diff --git a/build_en/data/Stage/Little.pxe b/assets/data_en/Stage/Little.pxe similarity index 100% rename from build_en/data/Stage/Little.pxe rename to assets/data_en/Stage/Little.pxe diff --git a/build_en/data/Stage/Little.pxm b/assets/data_en/Stage/Little.pxm similarity index 100% rename from build_en/data/Stage/Little.pxm rename to assets/data_en/Stage/Little.pxm diff --git a/build_en/data/Stage/Little.tsc b/assets/data_en/Stage/Little.tsc similarity index 100% rename from build_en/data/Stage/Little.tsc rename to assets/data_en/Stage/Little.tsc diff --git a/build_en/data/Stage/Lounge.pxe b/assets/data_en/Stage/Lounge.pxe similarity index 100% rename from build_en/data/Stage/Lounge.pxe rename to assets/data_en/Stage/Lounge.pxe diff --git a/build_en/data/Stage/Lounge.pxm b/assets/data_en/Stage/Lounge.pxm similarity index 100% rename from build_en/data/Stage/Lounge.pxm rename to assets/data_en/Stage/Lounge.pxm diff --git a/build_en/data/Stage/Lounge.tsc b/assets/data_en/Stage/Lounge.tsc similarity index 100% rename from build_en/data/Stage/Lounge.tsc rename to assets/data_en/Stage/Lounge.tsc diff --git a/build_en/data/Stage/Malco.pxe b/assets/data_en/Stage/Malco.pxe similarity index 100% rename from build_en/data/Stage/Malco.pxe rename to assets/data_en/Stage/Malco.pxe diff --git a/build_en/data/Stage/Malco.pxm b/assets/data_en/Stage/Malco.pxm similarity index 100% rename from build_en/data/Stage/Malco.pxm rename to assets/data_en/Stage/Malco.pxm diff --git a/build_en/data/Stage/Malco.tsc b/assets/data_en/Stage/Malco.tsc similarity index 100% rename from build_en/data/Stage/Malco.tsc rename to assets/data_en/Stage/Malco.tsc diff --git a/build_en/data/Stage/Mapi.pxe b/assets/data_en/Stage/Mapi.pxe similarity index 100% rename from build_en/data/Stage/Mapi.pxe rename to assets/data_en/Stage/Mapi.pxe diff --git a/build_en/data/Stage/Mapi.pxm b/assets/data_en/Stage/Mapi.pxm similarity index 100% rename from build_en/data/Stage/Mapi.pxm rename to assets/data_en/Stage/Mapi.pxm diff --git a/build_en/data/Stage/Mapi.tsc b/assets/data_en/Stage/Mapi.tsc similarity index 100% rename from build_en/data/Stage/Mapi.tsc rename to assets/data_en/Stage/Mapi.tsc diff --git a/build_en/data/Stage/Maze.pxa b/assets/data_en/Stage/Maze.pxa similarity index 100% rename from build_en/data/Stage/Maze.pxa rename to assets/data_en/Stage/Maze.pxa diff --git a/build_en/data/Stage/MazeA.pxe b/assets/data_en/Stage/MazeA.pxe similarity index 100% rename from build_en/data/Stage/MazeA.pxe rename to assets/data_en/Stage/MazeA.pxe diff --git a/build_en/data/Stage/MazeA.pxm b/assets/data_en/Stage/MazeA.pxm similarity index 100% rename from build_en/data/Stage/MazeA.pxm rename to assets/data_en/Stage/MazeA.pxm diff --git a/build_en/data/Stage/MazeA.tsc b/assets/data_en/Stage/MazeA.tsc similarity index 100% rename from build_en/data/Stage/MazeA.tsc rename to assets/data_en/Stage/MazeA.tsc diff --git a/build_en/data/Stage/MazeB.pxe b/assets/data_en/Stage/MazeB.pxe similarity index 100% rename from build_en/data/Stage/MazeB.pxe rename to assets/data_en/Stage/MazeB.pxe diff --git a/build_en/data/Stage/MazeB.pxm b/assets/data_en/Stage/MazeB.pxm similarity index 100% rename from build_en/data/Stage/MazeB.pxm rename to assets/data_en/Stage/MazeB.pxm diff --git a/build_en/data/Stage/MazeB.tsc b/assets/data_en/Stage/MazeB.tsc similarity index 100% rename from build_en/data/Stage/MazeB.tsc rename to assets/data_en/Stage/MazeB.tsc diff --git a/build_en/data/Stage/MazeD.pxe b/assets/data_en/Stage/MazeD.pxe similarity index 100% rename from build_en/data/Stage/MazeD.pxe rename to assets/data_en/Stage/MazeD.pxe diff --git a/build_en/data/Stage/MazeD.pxm b/assets/data_en/Stage/MazeD.pxm similarity index 100% rename from build_en/data/Stage/MazeD.pxm rename to assets/data_en/Stage/MazeD.pxm diff --git a/build_en/data/Stage/MazeD.tsc b/assets/data_en/Stage/MazeD.tsc similarity index 100% rename from build_en/data/Stage/MazeD.tsc rename to assets/data_en/Stage/MazeD.tsc diff --git a/build_en/data/Stage/MazeH.pxe b/assets/data_en/Stage/MazeH.pxe similarity index 100% rename from build_en/data/Stage/MazeH.pxe rename to assets/data_en/Stage/MazeH.pxe diff --git a/build_en/data/Stage/MazeH.pxm b/assets/data_en/Stage/MazeH.pxm similarity index 100% rename from build_en/data/Stage/MazeH.pxm rename to assets/data_en/Stage/MazeH.pxm diff --git a/build_en/data/Stage/MazeH.tsc b/assets/data_en/Stage/MazeH.tsc similarity index 100% rename from build_en/data/Stage/MazeH.tsc rename to assets/data_en/Stage/MazeH.tsc diff --git a/build_en/data/Stage/MazeI.pxe b/assets/data_en/Stage/MazeI.pxe similarity index 100% rename from build_en/data/Stage/MazeI.pxe rename to assets/data_en/Stage/MazeI.pxe diff --git a/build_en/data/Stage/MazeI.pxm b/assets/data_en/Stage/MazeI.pxm similarity index 100% rename from build_en/data/Stage/MazeI.pxm rename to assets/data_en/Stage/MazeI.pxm diff --git a/build_en/data/Stage/MazeI.tsc b/assets/data_en/Stage/MazeI.tsc similarity index 100% rename from build_en/data/Stage/MazeI.tsc rename to assets/data_en/Stage/MazeI.tsc diff --git a/build_en/data/Stage/MazeM.pxe b/assets/data_en/Stage/MazeM.pxe similarity index 100% rename from build_en/data/Stage/MazeM.pxe rename to assets/data_en/Stage/MazeM.pxe diff --git a/build_en/data/Stage/MazeM.pxm b/assets/data_en/Stage/MazeM.pxm similarity index 100% rename from build_en/data/Stage/MazeM.pxm rename to assets/data_en/Stage/MazeM.pxm diff --git a/build_en/data/Stage/MazeM.tsc b/assets/data_en/Stage/MazeM.tsc similarity index 100% rename from build_en/data/Stage/MazeM.tsc rename to assets/data_en/Stage/MazeM.tsc diff --git a/build_en/data/Stage/MazeO.pxe b/assets/data_en/Stage/MazeO.pxe similarity index 100% rename from build_en/data/Stage/MazeO.pxe rename to assets/data_en/Stage/MazeO.pxe diff --git a/build_en/data/Stage/MazeO.pxm b/assets/data_en/Stage/MazeO.pxm similarity index 100% rename from build_en/data/Stage/MazeO.pxm rename to assets/data_en/Stage/MazeO.pxm diff --git a/build_en/data/Stage/MazeO.tsc b/assets/data_en/Stage/MazeO.tsc similarity index 100% rename from build_en/data/Stage/MazeO.tsc rename to assets/data_en/Stage/MazeO.tsc diff --git a/build_en/data/Stage/MazeS.pxe b/assets/data_en/Stage/MazeS.pxe similarity index 100% rename from build_en/data/Stage/MazeS.pxe rename to assets/data_en/Stage/MazeS.pxe diff --git a/build_en/data/Stage/MazeS.pxm b/assets/data_en/Stage/MazeS.pxm similarity index 100% rename from build_en/data/Stage/MazeS.pxm rename to assets/data_en/Stage/MazeS.pxm diff --git a/build_en/data/Stage/MazeS.tsc b/assets/data_en/Stage/MazeS.tsc similarity index 100% rename from build_en/data/Stage/MazeS.tsc rename to assets/data_en/Stage/MazeS.tsc diff --git a/build_en/data/Stage/MazeW.pxe b/assets/data_en/Stage/MazeW.pxe similarity index 100% rename from build_en/data/Stage/MazeW.pxe rename to assets/data_en/Stage/MazeW.pxe diff --git a/build_en/data/Stage/MazeW.pxm b/assets/data_en/Stage/MazeW.pxm similarity index 100% rename from build_en/data/Stage/MazeW.pxm rename to assets/data_en/Stage/MazeW.pxm diff --git a/build_en/data/Stage/MazeW.tsc b/assets/data_en/Stage/MazeW.tsc similarity index 100% rename from build_en/data/Stage/MazeW.tsc rename to assets/data_en/Stage/MazeW.tsc diff --git a/build_en/data/Stage/MiBox.pxe b/assets/data_en/Stage/MiBox.pxe similarity index 100% rename from build_en/data/Stage/MiBox.pxe rename to assets/data_en/Stage/MiBox.pxe diff --git a/build_en/data/Stage/MiBox.pxm b/assets/data_en/Stage/MiBox.pxm similarity index 100% rename from build_en/data/Stage/MiBox.pxm rename to assets/data_en/Stage/MiBox.pxm diff --git a/build_en/data/Stage/MiBox.tsc b/assets/data_en/Stage/MiBox.tsc similarity index 100% rename from build_en/data/Stage/MiBox.tsc rename to assets/data_en/Stage/MiBox.tsc diff --git a/build_en/data/Stage/Mimi.pxa b/assets/data_en/Stage/Mimi.pxa similarity index 100% rename from build_en/data/Stage/Mimi.pxa rename to assets/data_en/Stage/Mimi.pxa diff --git a/build_en/data/Stage/Mimi.pxe b/assets/data_en/Stage/Mimi.pxe similarity index 100% rename from build_en/data/Stage/Mimi.pxe rename to assets/data_en/Stage/Mimi.pxe diff --git a/build_en/data/Stage/Mimi.pxm b/assets/data_en/Stage/Mimi.pxm similarity index 100% rename from build_en/data/Stage/Mimi.pxm rename to assets/data_en/Stage/Mimi.pxm diff --git a/build_en/data/Stage/Mimi.tsc b/assets/data_en/Stage/Mimi.tsc similarity index 100% rename from build_en/data/Stage/Mimi.tsc rename to assets/data_en/Stage/Mimi.tsc diff --git a/build_en/data/Stage/Momo.pxe b/assets/data_en/Stage/Momo.pxe similarity index 100% rename from build_en/data/Stage/Momo.pxe rename to assets/data_en/Stage/Momo.pxe diff --git a/build_en/data/Stage/Momo.pxm b/assets/data_en/Stage/Momo.pxm similarity index 100% rename from build_en/data/Stage/Momo.pxm rename to assets/data_en/Stage/Momo.pxm diff --git a/build_en/data/Stage/Momo.tsc b/assets/data_en/Stage/Momo.tsc similarity index 100% rename from build_en/data/Stage/Momo.tsc rename to assets/data_en/Stage/Momo.tsc diff --git a/build_en/data/Stage/New.pxe b/assets/data_en/Stage/New.pxe similarity index 100% rename from build_en/data/Stage/New.pxe rename to assets/data_en/Stage/New.pxe diff --git a/build_en/data/Stage/Oside.pxa b/assets/data_en/Stage/Oside.pxa similarity index 100% rename from build_en/data/Stage/Oside.pxa rename to assets/data_en/Stage/Oside.pxa diff --git a/build_en/data/Stage/Oside.pxe b/assets/data_en/Stage/Oside.pxe similarity index 100% rename from build_en/data/Stage/Oside.pxe rename to assets/data_en/Stage/Oside.pxe diff --git a/build_en/data/Stage/Oside.pxm b/assets/data_en/Stage/Oside.pxm similarity index 100% rename from build_en/data/Stage/Oside.pxm rename to assets/data_en/Stage/Oside.pxm diff --git a/build_en/data/Stage/Oside.tsc b/assets/data_en/Stage/Oside.tsc similarity index 100% rename from build_en/data/Stage/Oside.tsc rename to assets/data_en/Stage/Oside.tsc diff --git a/build_en/data/Stage/Ostep.pxe b/assets/data_en/Stage/Ostep.pxe similarity index 100% rename from build_en/data/Stage/Ostep.pxe rename to assets/data_en/Stage/Ostep.pxe diff --git a/build_en/data/Stage/Ostep.pxm b/assets/data_en/Stage/Ostep.pxm similarity index 100% rename from build_en/data/Stage/Ostep.pxm rename to assets/data_en/Stage/Ostep.pxm diff --git a/build_en/data/Stage/Ostep.tsc b/assets/data_en/Stage/Ostep.tsc similarity index 100% rename from build_en/data/Stage/Ostep.tsc rename to assets/data_en/Stage/Ostep.tsc diff --git a/build_en/data/Stage/Pens.pxa b/assets/data_en/Stage/Pens.pxa similarity index 100% rename from build_en/data/Stage/Pens.pxa rename to assets/data_en/Stage/Pens.pxa diff --git a/build_en/data/Stage/Pens1.pxe b/assets/data_en/Stage/Pens1.pxe similarity index 100% rename from build_en/data/Stage/Pens1.pxe rename to assets/data_en/Stage/Pens1.pxe diff --git a/build_en/data/Stage/Pens1.pxm b/assets/data_en/Stage/Pens1.pxm similarity index 100% rename from build_en/data/Stage/Pens1.pxm rename to assets/data_en/Stage/Pens1.pxm diff --git a/build_en/data/Stage/Pens1.tsc b/assets/data_en/Stage/Pens1.tsc similarity index 100% rename from build_en/data/Stage/Pens1.tsc rename to assets/data_en/Stage/Pens1.tsc diff --git a/build_en/data/Stage/Pens2.pxe b/assets/data_en/Stage/Pens2.pxe similarity index 100% rename from build_en/data/Stage/Pens2.pxe rename to assets/data_en/Stage/Pens2.pxe diff --git a/build_en/data/Stage/Pens2.pxm b/assets/data_en/Stage/Pens2.pxm similarity index 100% rename from build_en/data/Stage/Pens2.pxm rename to assets/data_en/Stage/Pens2.pxm diff --git a/build_en/data/Stage/Pens2.tsc b/assets/data_en/Stage/Pens2.tsc similarity index 100% rename from build_en/data/Stage/Pens2.tsc rename to assets/data_en/Stage/Pens2.tsc diff --git a/build_en/data/Stage/Pixel.pxe b/assets/data_en/Stage/Pixel.pxe similarity index 100% rename from build_en/data/Stage/Pixel.pxe rename to assets/data_en/Stage/Pixel.pxe diff --git a/build_en/data/Stage/Pixel.pxm b/assets/data_en/Stage/Pixel.pxm similarity index 100% rename from build_en/data/Stage/Pixel.pxm rename to assets/data_en/Stage/Pixel.pxm diff --git a/build_en/data/Stage/Pixel.tsc b/assets/data_en/Stage/Pixel.tsc similarity index 100% rename from build_en/data/Stage/Pixel.tsc rename to assets/data_en/Stage/Pixel.tsc diff --git a/build_en/data/Stage/Plant.pxe b/assets/data_en/Stage/Plant.pxe similarity index 100% rename from build_en/data/Stage/Plant.pxe rename to assets/data_en/Stage/Plant.pxe diff --git a/build_en/data/Stage/Plant.pxm b/assets/data_en/Stage/Plant.pxm similarity index 100% rename from build_en/data/Stage/Plant.pxm rename to assets/data_en/Stage/Plant.pxm diff --git a/build_en/data/Stage/Plant.tsc b/assets/data_en/Stage/Plant.tsc similarity index 100% rename from build_en/data/Stage/Plant.tsc rename to assets/data_en/Stage/Plant.tsc diff --git a/build_en/data/Stage/Pole.pxe b/assets/data_en/Stage/Pole.pxe similarity index 100% rename from build_en/data/Stage/Pole.pxe rename to assets/data_en/Stage/Pole.pxe diff --git a/build_en/data/Stage/Pole.pxm b/assets/data_en/Stage/Pole.pxm similarity index 100% rename from build_en/data/Stage/Pole.pxm rename to assets/data_en/Stage/Pole.pxm diff --git a/build_en/data/Stage/Pole.tsc b/assets/data_en/Stage/Pole.tsc similarity index 100% rename from build_en/data/Stage/Pole.tsc rename to assets/data_en/Stage/Pole.tsc diff --git a/build_en/data/Stage/Pool.pxe b/assets/data_en/Stage/Pool.pxe similarity index 100% rename from build_en/data/Stage/Pool.pxe rename to assets/data_en/Stage/Pool.pxe diff --git a/build_en/data/Stage/Pool.pxm b/assets/data_en/Stage/Pool.pxm similarity index 100% rename from build_en/data/Stage/Pool.pxm rename to assets/data_en/Stage/Pool.pxm diff --git a/build_en/data/Stage/Pool.tsc b/assets/data_en/Stage/Pool.tsc similarity index 100% rename from build_en/data/Stage/Pool.tsc rename to assets/data_en/Stage/Pool.tsc diff --git a/build_en/data/Stage/Prefa1.pxe b/assets/data_en/Stage/Prefa1.pxe similarity index 100% rename from build_en/data/Stage/Prefa1.pxe rename to assets/data_en/Stage/Prefa1.pxe diff --git a/build_en/data/Stage/Prefa1.pxm b/assets/data_en/Stage/Prefa1.pxm similarity index 100% rename from build_en/data/Stage/Prefa1.pxm rename to assets/data_en/Stage/Prefa1.pxm diff --git a/build_en/data/Stage/Prefa1.tsc b/assets/data_en/Stage/Prefa1.tsc similarity index 100% rename from build_en/data/Stage/Prefa1.tsc rename to assets/data_en/Stage/Prefa1.tsc diff --git a/build_en/data/Stage/Prefa2.pxe b/assets/data_en/Stage/Prefa2.pxe similarity index 100% rename from build_en/data/Stage/Prefa2.pxe rename to assets/data_en/Stage/Prefa2.pxe diff --git a/build_en/data/Stage/Prefa2.pxm b/assets/data_en/Stage/Prefa2.pxm similarity index 100% rename from build_en/data/Stage/Prefa2.pxm rename to assets/data_en/Stage/Prefa2.pxm diff --git a/build_en/data/Stage/Prefa2.tsc b/assets/data_en/Stage/Prefa2.tsc similarity index 100% rename from build_en/data/Stage/Prefa2.tsc rename to assets/data_en/Stage/Prefa2.tsc diff --git a/build_en/data/Stage/Priso1.pxe b/assets/data_en/Stage/Priso1.pxe similarity index 100% rename from build_en/data/Stage/Priso1.pxe rename to assets/data_en/Stage/Priso1.pxe diff --git a/build_en/data/Stage/Priso1.pxm b/assets/data_en/Stage/Priso1.pxm similarity index 100% rename from build_en/data/Stage/Priso1.pxm rename to assets/data_en/Stage/Priso1.pxm diff --git a/build_en/data/Stage/Priso1.tsc b/assets/data_en/Stage/Priso1.tsc similarity index 100% rename from build_en/data/Stage/Priso1.tsc rename to assets/data_en/Stage/Priso1.tsc diff --git a/build_en/data/Stage/Priso2.pxe b/assets/data_en/Stage/Priso2.pxe similarity index 100% rename from build_en/data/Stage/Priso2.pxe rename to assets/data_en/Stage/Priso2.pxe diff --git a/build_en/data/Stage/Priso2.pxm b/assets/data_en/Stage/Priso2.pxm similarity index 100% rename from build_en/data/Stage/Priso2.pxm rename to assets/data_en/Stage/Priso2.pxm diff --git a/build_en/data/Stage/Priso2.tsc b/assets/data_en/Stage/Priso2.tsc similarity index 100% rename from build_en/data/Stage/Priso2.tsc rename to assets/data_en/Stage/Priso2.tsc diff --git a/build_en/data/Stage/Prt0.pbm b/assets/data_en/Stage/Prt0.pbm similarity index 100% rename from build_en/data/Stage/Prt0.pbm rename to assets/data_en/Stage/Prt0.pbm diff --git a/build_en/data/Stage/PrtAlmond.pbm b/assets/data_en/Stage/PrtAlmond.pbm similarity index 100% rename from build_en/data/Stage/PrtAlmond.pbm rename to assets/data_en/Stage/PrtAlmond.pbm diff --git a/build_en/data/Stage/PrtBarr.pbm b/assets/data_en/Stage/PrtBarr.pbm similarity index 100% rename from build_en/data/Stage/PrtBarr.pbm rename to assets/data_en/Stage/PrtBarr.pbm diff --git a/build_en/data/Stage/PrtCave.pbm b/assets/data_en/Stage/PrtCave.pbm similarity index 100% rename from build_en/data/Stage/PrtCave.pbm rename to assets/data_en/Stage/PrtCave.pbm diff --git a/build_en/data/Stage/PrtCent.pbm b/assets/data_en/Stage/PrtCent.pbm similarity index 100% rename from build_en/data/Stage/PrtCent.pbm rename to assets/data_en/Stage/PrtCent.pbm diff --git a/build_en/data/Stage/PrtEggIn.pbm b/assets/data_en/Stage/PrtEggIn.pbm similarity index 100% rename from build_en/data/Stage/PrtEggIn.pbm rename to assets/data_en/Stage/PrtEggIn.pbm diff --git a/build_en/data/Stage/PrtEggX.pbm b/assets/data_en/Stage/PrtEggX.pbm similarity index 100% rename from build_en/data/Stage/PrtEggX.pbm rename to assets/data_en/Stage/PrtEggX.pbm diff --git a/build_en/data/Stage/PrtEggs.pbm b/assets/data_en/Stage/PrtEggs.pbm similarity index 100% rename from build_en/data/Stage/PrtEggs.pbm rename to assets/data_en/Stage/PrtEggs.pbm diff --git a/build_en/data/Stage/PrtFall.pbm b/assets/data_en/Stage/PrtFall.pbm similarity index 100% rename from build_en/data/Stage/PrtFall.pbm rename to assets/data_en/Stage/PrtFall.pbm diff --git a/build_en/data/Stage/PrtGard.pbm b/assets/data_en/Stage/PrtGard.pbm similarity index 100% rename from build_en/data/Stage/PrtGard.pbm rename to assets/data_en/Stage/PrtGard.pbm diff --git a/build_en/data/Stage/PrtHell.pbm b/assets/data_en/Stage/PrtHell.pbm similarity index 100% rename from build_en/data/Stage/PrtHell.pbm rename to assets/data_en/Stage/PrtHell.pbm diff --git a/build_en/data/Stage/PrtJail.pbm b/assets/data_en/Stage/PrtJail.pbm similarity index 100% rename from build_en/data/Stage/PrtJail.pbm rename to assets/data_en/Stage/PrtJail.pbm diff --git a/build_en/data/Stage/PrtLabo.pbm b/assets/data_en/Stage/PrtLabo.pbm similarity index 100% rename from build_en/data/Stage/PrtLabo.pbm rename to assets/data_en/Stage/PrtLabo.pbm diff --git a/build_en/data/Stage/PrtMaze.pbm b/assets/data_en/Stage/PrtMaze.pbm similarity index 100% rename from build_en/data/Stage/PrtMaze.pbm rename to assets/data_en/Stage/PrtMaze.pbm diff --git a/build_en/data/Stage/PrtMimi.pbm b/assets/data_en/Stage/PrtMimi.pbm similarity index 100% rename from build_en/data/Stage/PrtMimi.pbm rename to assets/data_en/Stage/PrtMimi.pbm diff --git a/build_en/data/Stage/PrtOside.pbm b/assets/data_en/Stage/PrtOside.pbm similarity index 100% rename from build_en/data/Stage/PrtOside.pbm rename to assets/data_en/Stage/PrtOside.pbm diff --git a/build_en/data/Stage/PrtPens.pbm b/assets/data_en/Stage/PrtPens.pbm similarity index 100% rename from build_en/data/Stage/PrtPens.pbm rename to assets/data_en/Stage/PrtPens.pbm diff --git a/build_en/data/Stage/PrtRiver.pbm b/assets/data_en/Stage/PrtRiver.pbm similarity index 100% rename from build_en/data/Stage/PrtRiver.pbm rename to assets/data_en/Stage/PrtRiver.pbm diff --git a/build_en/data/Stage/PrtSand.pbm b/assets/data_en/Stage/PrtSand.pbm similarity index 100% rename from build_en/data/Stage/PrtSand.pbm rename to assets/data_en/Stage/PrtSand.pbm diff --git a/build_en/data/Stage/PrtStore.pbm b/assets/data_en/Stage/PrtStore.pbm similarity index 100% rename from build_en/data/Stage/PrtStore.pbm rename to assets/data_en/Stage/PrtStore.pbm diff --git a/build_en/data/Stage/PrtWeed.pbm b/assets/data_en/Stage/PrtWeed.pbm similarity index 100% rename from build_en/data/Stage/PrtWeed.pbm rename to assets/data_en/Stage/PrtWeed.pbm diff --git a/build_en/data/Stage/PrtWhite.pbm b/assets/data_en/Stage/PrtWhite.pbm similarity index 100% rename from build_en/data/Stage/PrtWhite.pbm rename to assets/data_en/Stage/PrtWhite.pbm diff --git a/build_en/data/Stage/Ring1.pxe b/assets/data_en/Stage/Ring1.pxe similarity index 100% rename from build_en/data/Stage/Ring1.pxe rename to assets/data_en/Stage/Ring1.pxe diff --git a/build_en/data/Stage/Ring1.pxm b/assets/data_en/Stage/Ring1.pxm similarity index 100% rename from build_en/data/Stage/Ring1.pxm rename to assets/data_en/Stage/Ring1.pxm diff --git a/build_en/data/Stage/Ring1.tsc b/assets/data_en/Stage/Ring1.tsc similarity index 100% rename from build_en/data/Stage/Ring1.tsc rename to assets/data_en/Stage/Ring1.tsc diff --git a/build_en/data/Stage/Ring2.pxe b/assets/data_en/Stage/Ring2.pxe similarity index 100% rename from build_en/data/Stage/Ring2.pxe rename to assets/data_en/Stage/Ring2.pxe diff --git a/build_en/data/Stage/Ring2.pxm b/assets/data_en/Stage/Ring2.pxm similarity index 100% rename from build_en/data/Stage/Ring2.pxm rename to assets/data_en/Stage/Ring2.pxm diff --git a/build_en/data/Stage/Ring2.tsc b/assets/data_en/Stage/Ring2.tsc similarity index 100% rename from build_en/data/Stage/Ring2.tsc rename to assets/data_en/Stage/Ring2.tsc diff --git a/build_en/data/Stage/Ring3.pxe b/assets/data_en/Stage/Ring3.pxe similarity index 100% rename from build_en/data/Stage/Ring3.pxe rename to assets/data_en/Stage/Ring3.pxe diff --git a/build_en/data/Stage/Ring3.pxm b/assets/data_en/Stage/Ring3.pxm similarity index 100% rename from build_en/data/Stage/Ring3.pxm rename to assets/data_en/Stage/Ring3.pxm diff --git a/build_en/data/Stage/Ring3.tsc b/assets/data_en/Stage/Ring3.tsc similarity index 100% rename from build_en/data/Stage/Ring3.tsc rename to assets/data_en/Stage/Ring3.tsc diff --git a/build_en/data/Stage/River.pxa b/assets/data_en/Stage/River.pxa similarity index 100% rename from build_en/data/Stage/River.pxa rename to assets/data_en/Stage/River.pxa diff --git a/build_en/data/Stage/River.pxe b/assets/data_en/Stage/River.pxe similarity index 100% rename from build_en/data/Stage/River.pxe rename to assets/data_en/Stage/River.pxe diff --git a/build_en/data/Stage/River.pxm b/assets/data_en/Stage/River.pxm similarity index 100% rename from build_en/data/Stage/River.pxm rename to assets/data_en/Stage/River.pxm diff --git a/build_en/data/Stage/River.tsc b/assets/data_en/Stage/River.tsc similarity index 100% rename from build_en/data/Stage/River.tsc rename to assets/data_en/Stage/River.tsc diff --git a/build_en/data/Stage/Sand.pxa b/assets/data_en/Stage/Sand.pxa similarity index 100% rename from build_en/data/Stage/Sand.pxa rename to assets/data_en/Stage/Sand.pxa diff --git a/build_en/data/Stage/Sand.pxe b/assets/data_en/Stage/Sand.pxe similarity index 100% rename from build_en/data/Stage/Sand.pxe rename to assets/data_en/Stage/Sand.pxe diff --git a/build_en/data/Stage/Sand.pxm b/assets/data_en/Stage/Sand.pxm similarity index 100% rename from build_en/data/Stage/Sand.pxm rename to assets/data_en/Stage/Sand.pxm diff --git a/build_en/data/Stage/Sand.tsc b/assets/data_en/Stage/Sand.tsc similarity index 100% rename from build_en/data/Stage/Sand.tsc rename to assets/data_en/Stage/Sand.tsc diff --git a/build_en/data/Stage/SandE.pxe b/assets/data_en/Stage/SandE.pxe similarity index 100% rename from build_en/data/Stage/SandE.pxe rename to assets/data_en/Stage/SandE.pxe diff --git a/build_en/data/Stage/SandE.pxm b/assets/data_en/Stage/SandE.pxm similarity index 100% rename from build_en/data/Stage/SandE.pxm rename to assets/data_en/Stage/SandE.pxm diff --git a/build_en/data/Stage/SandE.tsc b/assets/data_en/Stage/SandE.tsc similarity index 100% rename from build_en/data/Stage/SandE.tsc rename to assets/data_en/Stage/SandE.tsc diff --git a/build_en/data/Stage/Santa.pxe b/assets/data_en/Stage/Santa.pxe similarity index 100% rename from build_en/data/Stage/Santa.pxe rename to assets/data_en/Stage/Santa.pxe diff --git a/build_en/data/Stage/Santa.pxm b/assets/data_en/Stage/Santa.pxm similarity index 100% rename from build_en/data/Stage/Santa.pxm rename to assets/data_en/Stage/Santa.pxm diff --git a/build_en/data/Stage/Santa.tsc b/assets/data_en/Stage/Santa.tsc similarity index 100% rename from build_en/data/Stage/Santa.tsc rename to assets/data_en/Stage/Santa.tsc diff --git a/build_en/data/Stage/Shelt.pxa b/assets/data_en/Stage/Shelt.pxa similarity index 100% rename from build_en/data/Stage/Shelt.pxa rename to assets/data_en/Stage/Shelt.pxa diff --git a/build_en/data/Stage/Shelt.pxe b/assets/data_en/Stage/Shelt.pxe similarity index 100% rename from build_en/data/Stage/Shelt.pxe rename to assets/data_en/Stage/Shelt.pxe diff --git a/build_en/data/Stage/Shelt.pxm b/assets/data_en/Stage/Shelt.pxm similarity index 100% rename from build_en/data/Stage/Shelt.pxm rename to assets/data_en/Stage/Shelt.pxm diff --git a/build_en/data/Stage/Shelt.tsc b/assets/data_en/Stage/Shelt.tsc similarity index 100% rename from build_en/data/Stage/Shelt.tsc rename to assets/data_en/Stage/Shelt.tsc diff --git a/build_en/data/Stage/Start.pxe b/assets/data_en/Stage/Start.pxe similarity index 100% rename from build_en/data/Stage/Start.pxe rename to assets/data_en/Stage/Start.pxe diff --git a/build_en/data/Stage/Start.pxm b/assets/data_en/Stage/Start.pxm similarity index 100% rename from build_en/data/Stage/Start.pxm rename to assets/data_en/Stage/Start.pxm diff --git a/build_en/data/Stage/Start.tsc b/assets/data_en/Stage/Start.tsc similarity index 100% rename from build_en/data/Stage/Start.tsc rename to assets/data_en/Stage/Start.tsc diff --git a/build_en/data/Stage/Statue.pxe b/assets/data_en/Stage/Statue.pxe similarity index 100% rename from build_en/data/Stage/Statue.pxe rename to assets/data_en/Stage/Statue.pxe diff --git a/build_en/data/Stage/Statue.pxm b/assets/data_en/Stage/Statue.pxm similarity index 100% rename from build_en/data/Stage/Statue.pxm rename to assets/data_en/Stage/Statue.pxm diff --git a/build_en/data/Stage/Statue.tsc b/assets/data_en/Stage/Statue.tsc similarity index 100% rename from build_en/data/Stage/Statue.tsc rename to assets/data_en/Stage/Statue.tsc diff --git a/build_en/data/Stage/Store.pxa b/assets/data_en/Stage/Store.pxa similarity index 100% rename from build_en/data/Stage/Store.pxa rename to assets/data_en/Stage/Store.pxa diff --git a/build_en/data/Stage/Stream.pxe b/assets/data_en/Stage/Stream.pxe similarity index 100% rename from build_en/data/Stage/Stream.pxe rename to assets/data_en/Stage/Stream.pxe diff --git a/build_en/data/Stage/Stream.pxm b/assets/data_en/Stage/Stream.pxm similarity index 100% rename from build_en/data/Stage/Stream.pxm rename to assets/data_en/Stage/Stream.pxm diff --git a/build_en/data/Stage/Stream.tsc b/assets/data_en/Stage/Stream.tsc similarity index 100% rename from build_en/data/Stage/Stream.tsc rename to assets/data_en/Stage/Stream.tsc diff --git a/build_en/data/Stage/Weed.pxa b/assets/data_en/Stage/Weed.pxa similarity index 100% rename from build_en/data/Stage/Weed.pxa rename to assets/data_en/Stage/Weed.pxa diff --git a/build_en/data/Stage/Weed.pxe b/assets/data_en/Stage/Weed.pxe similarity index 100% rename from build_en/data/Stage/Weed.pxe rename to assets/data_en/Stage/Weed.pxe diff --git a/build_en/data/Stage/Weed.pxm b/assets/data_en/Stage/Weed.pxm similarity index 100% rename from build_en/data/Stage/Weed.pxm rename to assets/data_en/Stage/Weed.pxm diff --git a/build_en/data/Stage/Weed.tsc b/assets/data_en/Stage/Weed.tsc similarity index 100% rename from build_en/data/Stage/Weed.tsc rename to assets/data_en/Stage/Weed.tsc diff --git a/build_en/data/Stage/WeedB.pxe b/assets/data_en/Stage/WeedB.pxe similarity index 100% rename from build_en/data/Stage/WeedB.pxe rename to assets/data_en/Stage/WeedB.pxe diff --git a/build_en/data/Stage/WeedB.pxm b/assets/data_en/Stage/WeedB.pxm similarity index 100% rename from build_en/data/Stage/WeedB.pxm rename to assets/data_en/Stage/WeedB.pxm diff --git a/build_en/data/Stage/WeedB.tsc b/assets/data_en/Stage/WeedB.tsc similarity index 100% rename from build_en/data/Stage/WeedB.tsc rename to assets/data_en/Stage/WeedB.tsc diff --git a/build_en/data/Stage/WeedD.pxe b/assets/data_en/Stage/WeedD.pxe similarity index 100% rename from build_en/data/Stage/WeedD.pxe rename to assets/data_en/Stage/WeedD.pxe diff --git a/build_en/data/Stage/WeedD.pxm b/assets/data_en/Stage/WeedD.pxm similarity index 100% rename from build_en/data/Stage/WeedD.pxm rename to assets/data_en/Stage/WeedD.pxm diff --git a/build_en/data/Stage/WeedD.tsc b/assets/data_en/Stage/WeedD.tsc similarity index 100% rename from build_en/data/Stage/WeedD.tsc rename to assets/data_en/Stage/WeedD.tsc diff --git a/build_en/data/Stage/WeedS.pxe b/assets/data_en/Stage/WeedS.pxe similarity index 100% rename from build_en/data/Stage/WeedS.pxe rename to assets/data_en/Stage/WeedS.pxe diff --git a/build_en/data/Stage/WeedS.pxm b/assets/data_en/Stage/WeedS.pxm similarity index 100% rename from build_en/data/Stage/WeedS.pxm rename to assets/data_en/Stage/WeedS.pxm diff --git a/build_en/data/Stage/WeedS.tsc b/assets/data_en/Stage/WeedS.tsc similarity index 100% rename from build_en/data/Stage/WeedS.tsc rename to assets/data_en/Stage/WeedS.tsc diff --git a/build_en/data/Stage/White.pxa b/assets/data_en/Stage/White.pxa similarity index 100% rename from build_en/data/Stage/White.pxa rename to assets/data_en/Stage/White.pxa diff --git a/build_en/data/Stage/e_Blcn.pxe b/assets/data_en/Stage/e_Blcn.pxe similarity index 100% rename from build_en/data/Stage/e_Blcn.pxe rename to assets/data_en/Stage/e_Blcn.pxe diff --git a/build_en/data/Stage/e_Blcn.pxm b/assets/data_en/Stage/e_Blcn.pxm similarity index 100% rename from build_en/data/Stage/e_Blcn.pxm rename to assets/data_en/Stage/e_Blcn.pxm diff --git a/build_en/data/Stage/e_Blcn.tsc b/assets/data_en/Stage/e_Blcn.tsc similarity index 100% rename from build_en/data/Stage/e_Blcn.tsc rename to assets/data_en/Stage/e_Blcn.tsc diff --git a/build_en/data/Stage/e_Ceme.pxe b/assets/data_en/Stage/e_Ceme.pxe similarity index 100% rename from build_en/data/Stage/e_Ceme.pxe rename to assets/data_en/Stage/e_Ceme.pxe diff --git a/build_en/data/Stage/e_Ceme.pxm b/assets/data_en/Stage/e_Ceme.pxm similarity index 100% rename from build_en/data/Stage/e_Ceme.pxm rename to assets/data_en/Stage/e_Ceme.pxm diff --git a/build_en/data/Stage/e_Ceme.tsc b/assets/data_en/Stage/e_Ceme.tsc similarity index 100% rename from build_en/data/Stage/e_Ceme.tsc rename to assets/data_en/Stage/e_Ceme.tsc diff --git a/build_en/data/Stage/e_Jenk.pxe b/assets/data_en/Stage/e_Jenk.pxe similarity index 100% rename from build_en/data/Stage/e_Jenk.pxe rename to assets/data_en/Stage/e_Jenk.pxe diff --git a/build_en/data/Stage/e_Jenk.pxm b/assets/data_en/Stage/e_Jenk.pxm similarity index 100% rename from build_en/data/Stage/e_Jenk.pxm rename to assets/data_en/Stage/e_Jenk.pxm diff --git a/build_en/data/Stage/e_Jenk.tsc b/assets/data_en/Stage/e_Jenk.tsc similarity index 100% rename from build_en/data/Stage/e_Jenk.tsc rename to assets/data_en/Stage/e_Jenk.tsc diff --git a/build_en/data/Stage/e_Labo.pxe b/assets/data_en/Stage/e_Labo.pxe similarity index 100% rename from build_en/data/Stage/e_Labo.pxe rename to assets/data_en/Stage/e_Labo.pxe diff --git a/build_en/data/Stage/e_Labo.pxm b/assets/data_en/Stage/e_Labo.pxm similarity index 100% rename from build_en/data/Stage/e_Labo.pxm rename to assets/data_en/Stage/e_Labo.pxm diff --git a/build_en/data/Stage/e_Labo.tsc b/assets/data_en/Stage/e_Labo.tsc similarity index 100% rename from build_en/data/Stage/e_Labo.tsc rename to assets/data_en/Stage/e_Labo.tsc diff --git a/build_en/data/Stage/e_Malc.pxe b/assets/data_en/Stage/e_Malc.pxe similarity index 100% rename from build_en/data/Stage/e_Malc.pxe rename to assets/data_en/Stage/e_Malc.pxe diff --git a/build_en/data/Stage/e_Malc.pxm b/assets/data_en/Stage/e_Malc.pxm similarity index 100% rename from build_en/data/Stage/e_Malc.pxm rename to assets/data_en/Stage/e_Malc.pxm diff --git a/build_en/data/Stage/e_Malc.tsc b/assets/data_en/Stage/e_Malc.tsc similarity index 100% rename from build_en/data/Stage/e_Malc.tsc rename to assets/data_en/Stage/e_Malc.tsc diff --git a/build_en/data/Stage/e_Maze.pxe b/assets/data_en/Stage/e_Maze.pxe similarity index 100% rename from build_en/data/Stage/e_Maze.pxe rename to assets/data_en/Stage/e_Maze.pxe diff --git a/build_en/data/Stage/e_Maze.pxm b/assets/data_en/Stage/e_Maze.pxm similarity index 100% rename from build_en/data/Stage/e_Maze.pxm rename to assets/data_en/Stage/e_Maze.pxm diff --git a/build_en/data/Stage/e_Maze.tsc b/assets/data_en/Stage/e_Maze.tsc similarity index 100% rename from build_en/data/Stage/e_Maze.tsc rename to assets/data_en/Stage/e_Maze.tsc diff --git a/build_en/data/Stage/e_Sky.pxe b/assets/data_en/Stage/e_Sky.pxe similarity index 100% rename from build_en/data/Stage/e_Sky.pxe rename to assets/data_en/Stage/e_Sky.pxe diff --git a/build_en/data/Stage/e_Sky.pxm b/assets/data_en/Stage/e_Sky.pxm similarity index 100% rename from build_en/data/Stage/e_Sky.pxm rename to assets/data_en/Stage/e_Sky.pxm diff --git a/build_en/data/Stage/e_Sky.tsc b/assets/data_en/Stage/e_Sky.tsc similarity index 100% rename from build_en/data/Stage/e_Sky.tsc rename to assets/data_en/Stage/e_Sky.tsc diff --git a/build_en/data/StageImage.pbm b/assets/data_en/StageImage.pbm similarity index 100% rename from build_en/data/StageImage.pbm rename to assets/data_en/StageImage.pbm diff --git a/build_en/data/StageSelect.tsc b/assets/data_en/StageSelect.tsc similarity index 100% rename from build_en/data/StageSelect.tsc rename to assets/data_en/StageSelect.tsc diff --git a/build_en/data/TextBox.pbm b/assets/data_en/TextBox.pbm similarity index 100% rename from build_en/data/TextBox.pbm rename to assets/data_en/TextBox.pbm diff --git a/build_en/data/Title.pbm b/assets/data_en/Title.pbm similarity index 100% rename from build_en/data/Title.pbm rename to assets/data_en/Title.pbm diff --git a/build_en/data/bk0.pbm b/assets/data_en/bk0.pbm similarity index 100% rename from build_en/data/bk0.pbm rename to assets/data_en/bk0.pbm diff --git a/build_en/data/bkBlack.pbm b/assets/data_en/bkBlack.pbm similarity index 100% rename from build_en/data/bkBlack.pbm rename to assets/data_en/bkBlack.pbm diff --git a/build_en/data/bkBlue.pbm b/assets/data_en/bkBlue.pbm similarity index 100% rename from build_en/data/bkBlue.pbm rename to assets/data_en/bkBlue.pbm diff --git a/build_en/data/bkFall.pbm b/assets/data_en/bkFall.pbm similarity index 100% rename from build_en/data/bkFall.pbm rename to assets/data_en/bkFall.pbm diff --git a/build_en/data/bkFog.pbm b/assets/data_en/bkFog.pbm similarity index 100% rename from build_en/data/bkFog.pbm rename to assets/data_en/bkFog.pbm diff --git a/build_en/data/bkGard.pbm b/assets/data_en/bkGard.pbm similarity index 100% rename from build_en/data/bkGard.pbm rename to assets/data_en/bkGard.pbm diff --git a/build_en/data/bkGray.pbm b/assets/data_en/bkGray.pbm similarity index 100% rename from build_en/data/bkGray.pbm rename to assets/data_en/bkGray.pbm diff --git a/build_en/data/bkGreen.pbm b/assets/data_en/bkGreen.pbm similarity index 100% rename from build_en/data/bkGreen.pbm rename to assets/data_en/bkGreen.pbm diff --git a/build_en/data/bkMaze.pbm b/assets/data_en/bkMaze.pbm similarity index 100% rename from build_en/data/bkMaze.pbm rename to assets/data_en/bkMaze.pbm diff --git a/build_en/data/bkMoon.pbm b/assets/data_en/bkMoon.pbm similarity index 100% rename from build_en/data/bkMoon.pbm rename to assets/data_en/bkMoon.pbm diff --git a/build_en/data/bkRed.pbm b/assets/data_en/bkRed.pbm similarity index 100% rename from build_en/data/bkRed.pbm rename to assets/data_en/bkRed.pbm diff --git a/build_en/data/bkWater.pbm b/assets/data_en/bkWater.pbm similarity index 100% rename from build_en/data/bkWater.pbm rename to assets/data_en/bkWater.pbm diff --git a/build_en/data/casts.pbm b/assets/data_en/casts.pbm similarity index 100% rename from build_en/data/casts.pbm rename to assets/data_en/casts.pbm diff --git a/build_en/data/npc.tbl b/assets/data_en/npc.tbl similarity index 100% rename from build_en/data/npc.tbl rename to assets/data_en/npc.tbl diff --git a/build_jp/data/Arms.pbm b/assets/data_jp/Arms.pbm similarity index 100% rename from build_jp/data/Arms.pbm rename to assets/data_jp/Arms.pbm diff --git a/build_jp/data/ArmsImage.pbm b/assets/data_jp/ArmsImage.pbm similarity index 100% rename from build_jp/data/ArmsImage.pbm rename to assets/data_jp/ArmsImage.pbm diff --git a/build_jp/data/ArmsItem.tsc b/assets/data_jp/ArmsItem.tsc similarity index 100% rename from build_jp/data/ArmsItem.tsc rename to assets/data_jp/ArmsItem.tsc diff --git a/build_jp/data/Bullet.pbm b/assets/data_jp/Bullet.pbm similarity index 100% rename from build_jp/data/Bullet.pbm rename to assets/data_jp/Bullet.pbm diff --git a/build_jp/data/Caret.pbm b/assets/data_jp/Caret.pbm similarity index 100% rename from build_jp/data/Caret.pbm rename to assets/data_jp/Caret.pbm diff --git a/build_jp/data/Credit.tsc b/assets/data_jp/Credit.tsc similarity index 100% rename from build_jp/data/Credit.tsc rename to assets/data_jp/Credit.tsc diff --git a/build_jp/data/Face.pbm b/assets/data_jp/Face.pbm similarity index 100% rename from build_jp/data/Face.pbm rename to assets/data_jp/Face.pbm diff --git a/build_jp/data/Fade.pbm b/assets/data_jp/Fade.pbm similarity index 100% rename from build_jp/data/Fade.pbm rename to assets/data_jp/Fade.pbm diff --git a/build_jp/data/Head.tsc b/assets/data_jp/Head.tsc similarity index 100% rename from build_jp/data/Head.tsc rename to assets/data_jp/Head.tsc diff --git a/build_jp/data/ItemImage.pbm b/assets/data_jp/ItemImage.pbm similarity index 100% rename from build_jp/data/ItemImage.pbm rename to assets/data_jp/ItemImage.pbm diff --git a/build_jp/data/Loading.pbm b/assets/data_jp/Loading.pbm similarity index 100% rename from build_jp/data/Loading.pbm rename to assets/data_jp/Loading.pbm diff --git a/build_jp/data/MyChar.pbm b/assets/data_jp/MyChar.pbm similarity index 100% rename from build_jp/data/MyChar.pbm rename to assets/data_jp/MyChar.pbm diff --git a/build_jp/data/Npc/Npc0.pbm b/assets/data_jp/Npc/Npc0.pbm similarity index 100% rename from build_jp/data/Npc/Npc0.pbm rename to assets/data_jp/Npc/Npc0.pbm diff --git a/build_jp/data/Npc/NpcAlmo1.pbm b/assets/data_jp/Npc/NpcAlmo1.pbm similarity index 100% rename from build_jp/data/Npc/NpcAlmo1.pbm rename to assets/data_jp/Npc/NpcAlmo1.pbm diff --git a/build_jp/data/Npc/NpcAlmo2.pbm b/assets/data_jp/Npc/NpcAlmo2.pbm similarity index 100% rename from build_jp/data/Npc/NpcAlmo2.pbm rename to assets/data_jp/Npc/NpcAlmo2.pbm diff --git a/build_jp/data/Npc/NpcBallos.pbm b/assets/data_jp/Npc/NpcBallos.pbm similarity index 100% rename from build_jp/data/Npc/NpcBallos.pbm rename to assets/data_jp/Npc/NpcBallos.pbm diff --git a/build_jp/data/Npc/NpcBllg.pbm b/assets/data_jp/Npc/NpcBllg.pbm similarity index 100% rename from build_jp/data/Npc/NpcBllg.pbm rename to assets/data_jp/Npc/NpcBllg.pbm diff --git a/build_jp/data/Npc/NpcCemet.pbm b/assets/data_jp/Npc/NpcCemet.pbm similarity index 100% rename from build_jp/data/Npc/NpcCemet.pbm rename to assets/data_jp/Npc/NpcCemet.pbm diff --git a/build_jp/data/Npc/NpcCent.pbm b/assets/data_jp/Npc/NpcCent.pbm similarity index 100% rename from build_jp/data/Npc/NpcCent.pbm rename to assets/data_jp/Npc/NpcCent.pbm diff --git a/build_jp/data/Npc/NpcCurly.pbm b/assets/data_jp/Npc/NpcCurly.pbm similarity index 100% rename from build_jp/data/Npc/NpcCurly.pbm rename to assets/data_jp/Npc/NpcCurly.pbm diff --git a/build_jp/data/Npc/NpcDark.pbm b/assets/data_jp/Npc/NpcDark.pbm similarity index 100% rename from build_jp/data/Npc/NpcDark.pbm rename to assets/data_jp/Npc/NpcDark.pbm diff --git a/build_jp/data/Npc/NpcDr.pbm b/assets/data_jp/Npc/NpcDr.pbm similarity index 100% rename from build_jp/data/Npc/NpcDr.pbm rename to assets/data_jp/Npc/NpcDr.pbm diff --git a/build_jp/data/Npc/NpcEggs1.pbm b/assets/data_jp/Npc/NpcEggs1.pbm similarity index 100% rename from build_jp/data/Npc/NpcEggs1.pbm rename to assets/data_jp/Npc/NpcEggs1.pbm diff --git a/build_jp/data/Npc/NpcEggs2.pbm b/assets/data_jp/Npc/NpcEggs2.pbm similarity index 100% rename from build_jp/data/Npc/NpcEggs2.pbm rename to assets/data_jp/Npc/NpcEggs2.pbm diff --git a/build_jp/data/Npc/NpcFrog.pbm b/assets/data_jp/Npc/NpcFrog.pbm similarity index 100% rename from build_jp/data/Npc/NpcFrog.pbm rename to assets/data_jp/Npc/NpcFrog.pbm diff --git a/build_jp/data/Npc/NpcGuest.pbm b/assets/data_jp/Npc/NpcGuest.pbm similarity index 100% rename from build_jp/data/Npc/NpcGuest.pbm rename to assets/data_jp/Npc/NpcGuest.pbm diff --git a/build_jp/data/Npc/NpcHell.pbm b/assets/data_jp/Npc/NpcHell.pbm similarity index 100% rename from build_jp/data/Npc/NpcHell.pbm rename to assets/data_jp/Npc/NpcHell.pbm diff --git a/build_jp/data/Npc/NpcHeri.pbm b/assets/data_jp/Npc/NpcHeri.pbm similarity index 100% rename from build_jp/data/Npc/NpcHeri.pbm rename to assets/data_jp/Npc/NpcHeri.pbm diff --git a/build_jp/data/Npc/NpcIronH.pbm b/assets/data_jp/Npc/NpcIronH.pbm similarity index 100% rename from build_jp/data/Npc/NpcIronH.pbm rename to assets/data_jp/Npc/NpcIronH.pbm diff --git a/build_jp/data/Npc/NpcIsland.pbm b/assets/data_jp/Npc/NpcIsland.pbm similarity index 100% rename from build_jp/data/Npc/NpcIsland.pbm rename to assets/data_jp/Npc/NpcIsland.pbm diff --git a/build_jp/data/Npc/NpcKings.pbm b/assets/data_jp/Npc/NpcKings.pbm similarity index 100% rename from build_jp/data/Npc/NpcKings.pbm rename to assets/data_jp/Npc/NpcKings.pbm diff --git a/build_jp/data/Npc/NpcMaze.pbm b/assets/data_jp/Npc/NpcMaze.pbm similarity index 100% rename from build_jp/data/Npc/NpcMaze.pbm rename to assets/data_jp/Npc/NpcMaze.pbm diff --git a/build_jp/data/Npc/NpcMiza.pbm b/assets/data_jp/Npc/NpcMiza.pbm similarity index 100% rename from build_jp/data/Npc/NpcMiza.pbm rename to assets/data_jp/Npc/NpcMiza.pbm diff --git a/build_jp/data/Npc/NpcMoon.pbm b/assets/data_jp/Npc/NpcMoon.pbm similarity index 100% rename from build_jp/data/Npc/NpcMoon.pbm rename to assets/data_jp/Npc/NpcMoon.pbm diff --git a/build_jp/data/Npc/NpcOmg.pbm b/assets/data_jp/Npc/NpcOmg.pbm similarity index 100% rename from build_jp/data/Npc/NpcOmg.pbm rename to assets/data_jp/Npc/NpcOmg.pbm diff --git a/build_jp/data/Npc/NpcPlant.pbm b/assets/data_jp/Npc/NpcPlant.pbm similarity index 100% rename from build_jp/data/Npc/NpcPlant.pbm rename to assets/data_jp/Npc/NpcPlant.pbm diff --git a/build_jp/data/Npc/NpcPress.pbm b/assets/data_jp/Npc/NpcPress.pbm similarity index 100% rename from build_jp/data/Npc/NpcPress.pbm rename to assets/data_jp/Npc/NpcPress.pbm diff --git a/build_jp/data/Npc/NpcPriest.pbm b/assets/data_jp/Npc/NpcPriest.pbm similarity index 100% rename from build_jp/data/Npc/NpcPriest.pbm rename to assets/data_jp/Npc/NpcPriest.pbm diff --git a/build_jp/data/Npc/NpcRavil.pbm b/assets/data_jp/Npc/NpcRavil.pbm similarity index 100% rename from build_jp/data/Npc/NpcRavil.pbm rename to assets/data_jp/Npc/NpcRavil.pbm diff --git a/build_jp/data/Npc/NpcRed.pbm b/assets/data_jp/Npc/NpcRed.pbm similarity index 100% rename from build_jp/data/Npc/NpcRed.pbm rename to assets/data_jp/Npc/NpcRed.pbm diff --git a/build_jp/data/Npc/NpcRegu.pbm b/assets/data_jp/Npc/NpcRegu.pbm similarity index 100% rename from build_jp/data/Npc/NpcRegu.pbm rename to assets/data_jp/Npc/NpcRegu.pbm diff --git a/build_jp/data/Npc/NpcSand.pbm b/assets/data_jp/Npc/NpcSand.pbm similarity index 100% rename from build_jp/data/Npc/NpcSand.pbm rename to assets/data_jp/Npc/NpcSand.pbm diff --git a/build_jp/data/Npc/NpcStream.pbm b/assets/data_jp/Npc/NpcStream.pbm similarity index 100% rename from build_jp/data/Npc/NpcStream.pbm rename to assets/data_jp/Npc/NpcStream.pbm diff --git a/build_jp/data/Npc/NpcSym.pbm b/assets/data_jp/Npc/NpcSym.pbm similarity index 100% rename from build_jp/data/Npc/NpcSym.pbm rename to assets/data_jp/Npc/NpcSym.pbm diff --git a/build_jp/data/Npc/NpcToro.pbm b/assets/data_jp/Npc/NpcToro.pbm similarity index 100% rename from build_jp/data/Npc/NpcToro.pbm rename to assets/data_jp/Npc/NpcToro.pbm diff --git a/build_jp/data/Npc/NpcTwinD.pbm b/assets/data_jp/Npc/NpcTwinD.pbm similarity index 100% rename from build_jp/data/Npc/NpcTwinD.pbm rename to assets/data_jp/Npc/NpcTwinD.pbm diff --git a/build_jp/data/Npc/NpcWeed.pbm b/assets/data_jp/Npc/NpcWeed.pbm similarity index 100% rename from build_jp/data/Npc/NpcWeed.pbm rename to assets/data_jp/Npc/NpcWeed.pbm diff --git a/build_jp/data/Npc/NpcX.pbm b/assets/data_jp/Npc/NpcX.pbm similarity index 100% rename from build_jp/data/Npc/NpcX.pbm rename to assets/data_jp/Npc/NpcX.pbm diff --git a/build_jp/data/Stage/0.pxa b/assets/data_jp/Stage/0.pxa similarity index 100% rename from build_jp/data/Stage/0.pxa rename to assets/data_jp/Stage/0.pxa diff --git a/build_jp/data/Stage/0.pxe b/assets/data_jp/Stage/0.pxe similarity index 100% rename from build_jp/data/Stage/0.pxe rename to assets/data_jp/Stage/0.pxe diff --git a/build_jp/data/Stage/0.pxm b/assets/data_jp/Stage/0.pxm similarity index 100% rename from build_jp/data/Stage/0.pxm rename to assets/data_jp/Stage/0.pxm diff --git a/build_jp/data/Stage/0.tsc b/assets/data_jp/Stage/0.tsc similarity index 100% rename from build_jp/data/Stage/0.tsc rename to assets/data_jp/Stage/0.tsc diff --git a/build_jp/data/Stage/555.pxe b/assets/data_jp/Stage/555.pxe similarity index 100% rename from build_jp/data/Stage/555.pxe rename to assets/data_jp/Stage/555.pxe diff --git a/build_jp/data/Stage/Almond.pxa b/assets/data_jp/Stage/Almond.pxa similarity index 100% rename from build_jp/data/Stage/Almond.pxa rename to assets/data_jp/Stage/Almond.pxa diff --git a/build_jp/data/Stage/Almond.pxe b/assets/data_jp/Stage/Almond.pxe similarity index 100% rename from build_jp/data/Stage/Almond.pxe rename to assets/data_jp/Stage/Almond.pxe diff --git a/build_jp/data/Stage/Almond.pxm b/assets/data_jp/Stage/Almond.pxm similarity index 100% rename from build_jp/data/Stage/Almond.pxm rename to assets/data_jp/Stage/Almond.pxm diff --git a/build_jp/data/Stage/Almond.tsc b/assets/data_jp/Stage/Almond.tsc similarity index 100% rename from build_jp/data/Stage/Almond.tsc rename to assets/data_jp/Stage/Almond.tsc diff --git a/build_jp/data/Stage/Ballo1.pxe b/assets/data_jp/Stage/Ballo1.pxe similarity index 100% rename from build_jp/data/Stage/Ballo1.pxe rename to assets/data_jp/Stage/Ballo1.pxe diff --git a/build_jp/data/Stage/Ballo1.pxm b/assets/data_jp/Stage/Ballo1.pxm similarity index 100% rename from build_jp/data/Stage/Ballo1.pxm rename to assets/data_jp/Stage/Ballo1.pxm diff --git a/build_jp/data/Stage/Ballo1.tsc b/assets/data_jp/Stage/Ballo1.tsc similarity index 100% rename from build_jp/data/Stage/Ballo1.tsc rename to assets/data_jp/Stage/Ballo1.tsc diff --git a/build_jp/data/Stage/Ballo2.pxe b/assets/data_jp/Stage/Ballo2.pxe similarity index 100% rename from build_jp/data/Stage/Ballo2.pxe rename to assets/data_jp/Stage/Ballo2.pxe diff --git a/build_jp/data/Stage/Ballo2.pxm b/assets/data_jp/Stage/Ballo2.pxm similarity index 100% rename from build_jp/data/Stage/Ballo2.pxm rename to assets/data_jp/Stage/Ballo2.pxm diff --git a/build_jp/data/Stage/Ballo2.tsc b/assets/data_jp/Stage/Ballo2.tsc similarity index 100% rename from build_jp/data/Stage/Ballo2.tsc rename to assets/data_jp/Stage/Ballo2.tsc diff --git a/build_jp/data/Stage/Barr.pxa b/assets/data_jp/Stage/Barr.pxa similarity index 100% rename from build_jp/data/Stage/Barr.pxa rename to assets/data_jp/Stage/Barr.pxa diff --git a/build_jp/data/Stage/Barr.pxe b/assets/data_jp/Stage/Barr.pxe similarity index 100% rename from build_jp/data/Stage/Barr.pxe rename to assets/data_jp/Stage/Barr.pxe diff --git a/build_jp/data/Stage/Barr.pxm b/assets/data_jp/Stage/Barr.pxm similarity index 100% rename from build_jp/data/Stage/Barr.pxm rename to assets/data_jp/Stage/Barr.pxm diff --git a/build_jp/data/Stage/Barr.tsc b/assets/data_jp/Stage/Barr.tsc similarity index 100% rename from build_jp/data/Stage/Barr.tsc rename to assets/data_jp/Stage/Barr.tsc diff --git a/build_jp/data/Stage/Blcny1.pxe b/assets/data_jp/Stage/Blcny1.pxe similarity index 100% rename from build_jp/data/Stage/Blcny1.pxe rename to assets/data_jp/Stage/Blcny1.pxe diff --git a/build_jp/data/Stage/Blcny1.pxm b/assets/data_jp/Stage/Blcny1.pxm similarity index 100% rename from build_jp/data/Stage/Blcny1.pxm rename to assets/data_jp/Stage/Blcny1.pxm diff --git a/build_jp/data/Stage/Blcny1.tsc b/assets/data_jp/Stage/Blcny1.tsc similarity index 100% rename from build_jp/data/Stage/Blcny1.tsc rename to assets/data_jp/Stage/Blcny1.tsc diff --git a/build_jp/data/Stage/Blcny2.pxe b/assets/data_jp/Stage/Blcny2.pxe similarity index 100% rename from build_jp/data/Stage/Blcny2.pxe rename to assets/data_jp/Stage/Blcny2.pxe diff --git a/build_jp/data/Stage/Blcny2.pxm b/assets/data_jp/Stage/Blcny2.pxm similarity index 100% rename from build_jp/data/Stage/Blcny2.pxm rename to assets/data_jp/Stage/Blcny2.pxm diff --git a/build_jp/data/Stage/Blcny2.tsc b/assets/data_jp/Stage/Blcny2.tsc similarity index 100% rename from build_jp/data/Stage/Blcny2.tsc rename to assets/data_jp/Stage/Blcny2.tsc diff --git a/build_jp/data/Stage/Cave.pxa b/assets/data_jp/Stage/Cave.pxa similarity index 100% rename from build_jp/data/Stage/Cave.pxa rename to assets/data_jp/Stage/Cave.pxa diff --git a/build_jp/data/Stage/Cave.pxe b/assets/data_jp/Stage/Cave.pxe similarity index 100% rename from build_jp/data/Stage/Cave.pxe rename to assets/data_jp/Stage/Cave.pxe diff --git a/build_jp/data/Stage/Cave.pxm b/assets/data_jp/Stage/Cave.pxm similarity index 100% rename from build_jp/data/Stage/Cave.pxm rename to assets/data_jp/Stage/Cave.pxm diff --git a/build_jp/data/Stage/Cave.tsc b/assets/data_jp/Stage/Cave.tsc similarity index 100% rename from build_jp/data/Stage/Cave.tsc rename to assets/data_jp/Stage/Cave.tsc diff --git a/build_jp/data/Stage/Cemet.pxe b/assets/data_jp/Stage/Cemet.pxe similarity index 100% rename from build_jp/data/Stage/Cemet.pxe rename to assets/data_jp/Stage/Cemet.pxe diff --git a/build_jp/data/Stage/Cemet.pxm b/assets/data_jp/Stage/Cemet.pxm similarity index 100% rename from build_jp/data/Stage/Cemet.pxm rename to assets/data_jp/Stage/Cemet.pxm diff --git a/build_jp/data/Stage/Cemet.tsc b/assets/data_jp/Stage/Cemet.tsc similarity index 100% rename from build_jp/data/Stage/Cemet.tsc rename to assets/data_jp/Stage/Cemet.tsc diff --git a/build_jp/data/Stage/Cent.pxa b/assets/data_jp/Stage/Cent.pxa similarity index 100% rename from build_jp/data/Stage/Cent.pxa rename to assets/data_jp/Stage/Cent.pxa diff --git a/build_jp/data/Stage/Cent.pxe b/assets/data_jp/Stage/Cent.pxe similarity index 100% rename from build_jp/data/Stage/Cent.pxe rename to assets/data_jp/Stage/Cent.pxe diff --git a/build_jp/data/Stage/Cent.pxm b/assets/data_jp/Stage/Cent.pxm similarity index 100% rename from build_jp/data/Stage/Cent.pxm rename to assets/data_jp/Stage/Cent.pxm diff --git a/build_jp/data/Stage/Cent.tsc b/assets/data_jp/Stage/Cent.tsc similarity index 100% rename from build_jp/data/Stage/Cent.tsc rename to assets/data_jp/Stage/Cent.tsc diff --git a/build_jp/data/Stage/CentW.pxe b/assets/data_jp/Stage/CentW.pxe similarity index 100% rename from build_jp/data/Stage/CentW.pxe rename to assets/data_jp/Stage/CentW.pxe diff --git a/build_jp/data/Stage/CentW.pxm b/assets/data_jp/Stage/CentW.pxm similarity index 100% rename from build_jp/data/Stage/CentW.pxm rename to assets/data_jp/Stage/CentW.pxm diff --git a/build_jp/data/Stage/CentW.tsc b/assets/data_jp/Stage/CentW.tsc similarity index 100% rename from build_jp/data/Stage/CentW.tsc rename to assets/data_jp/Stage/CentW.tsc diff --git a/build_jp/data/Stage/Chako.pxe b/assets/data_jp/Stage/Chako.pxe similarity index 100% rename from build_jp/data/Stage/Chako.pxe rename to assets/data_jp/Stage/Chako.pxe diff --git a/build_jp/data/Stage/Chako.pxm b/assets/data_jp/Stage/Chako.pxm similarity index 100% rename from build_jp/data/Stage/Chako.pxm rename to assets/data_jp/Stage/Chako.pxm diff --git a/build_jp/data/Stage/Chako.tsc b/assets/data_jp/Stage/Chako.tsc similarity index 100% rename from build_jp/data/Stage/Chako.tsc rename to assets/data_jp/Stage/Chako.tsc diff --git a/build_jp/data/Stage/Clock.pxe b/assets/data_jp/Stage/Clock.pxe similarity index 100% rename from build_jp/data/Stage/Clock.pxe rename to assets/data_jp/Stage/Clock.pxe diff --git a/build_jp/data/Stage/Clock.pxm b/assets/data_jp/Stage/Clock.pxm similarity index 100% rename from build_jp/data/Stage/Clock.pxm rename to assets/data_jp/Stage/Clock.pxm diff --git a/build_jp/data/Stage/Clock.tsc b/assets/data_jp/Stage/Clock.tsc similarity index 100% rename from build_jp/data/Stage/Clock.tsc rename to assets/data_jp/Stage/Clock.tsc diff --git a/build_jp/data/Stage/Comu.pxe b/assets/data_jp/Stage/Comu.pxe similarity index 100% rename from build_jp/data/Stage/Comu.pxe rename to assets/data_jp/Stage/Comu.pxe diff --git a/build_jp/data/Stage/Comu.pxm b/assets/data_jp/Stage/Comu.pxm similarity index 100% rename from build_jp/data/Stage/Comu.pxm rename to assets/data_jp/Stage/Comu.pxm diff --git a/build_jp/data/Stage/Comu.tsc b/assets/data_jp/Stage/Comu.tsc similarity index 100% rename from build_jp/data/Stage/Comu.tsc rename to assets/data_jp/Stage/Comu.tsc diff --git a/build_jp/data/Stage/Cook.pxm b/assets/data_jp/Stage/Cook.pxm similarity index 100% rename from build_jp/data/Stage/Cook.pxm rename to assets/data_jp/Stage/Cook.pxm diff --git a/build_jp/data/Stage/Cthu.pxe b/assets/data_jp/Stage/Cthu.pxe similarity index 100% rename from build_jp/data/Stage/Cthu.pxe rename to assets/data_jp/Stage/Cthu.pxe diff --git a/build_jp/data/Stage/Cthu.pxm b/assets/data_jp/Stage/Cthu.pxm similarity index 100% rename from build_jp/data/Stage/Cthu.pxm rename to assets/data_jp/Stage/Cthu.pxm diff --git a/build_jp/data/Stage/Cthu.tsc b/assets/data_jp/Stage/Cthu.tsc similarity index 100% rename from build_jp/data/Stage/Cthu.tsc rename to assets/data_jp/Stage/Cthu.tsc diff --git a/build_jp/data/Stage/Cthu2.pxe b/assets/data_jp/Stage/Cthu2.pxe similarity index 100% rename from build_jp/data/Stage/Cthu2.pxe rename to assets/data_jp/Stage/Cthu2.pxe diff --git a/build_jp/data/Stage/Cthu2.pxm b/assets/data_jp/Stage/Cthu2.pxm similarity index 100% rename from build_jp/data/Stage/Cthu2.pxm rename to assets/data_jp/Stage/Cthu2.pxm diff --git a/build_jp/data/Stage/Cthu2.tsc b/assets/data_jp/Stage/Cthu2.tsc similarity index 100% rename from build_jp/data/Stage/Cthu2.tsc rename to assets/data_jp/Stage/Cthu2.tsc diff --git a/build_jp/data/Stage/Curly.pxe b/assets/data_jp/Stage/Curly.pxe similarity index 100% rename from build_jp/data/Stage/Curly.pxe rename to assets/data_jp/Stage/Curly.pxe diff --git a/build_jp/data/Stage/Curly.pxm b/assets/data_jp/Stage/Curly.pxm similarity index 100% rename from build_jp/data/Stage/Curly.pxm rename to assets/data_jp/Stage/Curly.pxm diff --git a/build_jp/data/Stage/Curly.tsc b/assets/data_jp/Stage/Curly.tsc similarity index 100% rename from build_jp/data/Stage/Curly.tsc rename to assets/data_jp/Stage/Curly.tsc diff --git a/build_jp/data/Stage/CurlyS.pxe b/assets/data_jp/Stage/CurlyS.pxe similarity index 100% rename from build_jp/data/Stage/CurlyS.pxe rename to assets/data_jp/Stage/CurlyS.pxe diff --git a/build_jp/data/Stage/CurlyS.pxm b/assets/data_jp/Stage/CurlyS.pxm similarity index 100% rename from build_jp/data/Stage/CurlyS.pxm rename to assets/data_jp/Stage/CurlyS.pxm diff --git a/build_jp/data/Stage/CurlyS.tsc b/assets/data_jp/Stage/CurlyS.tsc similarity index 100% rename from build_jp/data/Stage/CurlyS.tsc rename to assets/data_jp/Stage/CurlyS.tsc diff --git a/build_jp/data/Stage/Dark.pxe b/assets/data_jp/Stage/Dark.pxe similarity index 100% rename from build_jp/data/Stage/Dark.pxe rename to assets/data_jp/Stage/Dark.pxe diff --git a/build_jp/data/Stage/Dark.pxm b/assets/data_jp/Stage/Dark.pxm similarity index 100% rename from build_jp/data/Stage/Dark.pxm rename to assets/data_jp/Stage/Dark.pxm diff --git a/build_jp/data/Stage/Dark.tsc b/assets/data_jp/Stage/Dark.tsc similarity index 100% rename from build_jp/data/Stage/Dark.tsc rename to assets/data_jp/Stage/Dark.tsc diff --git a/build_jp/data/Stage/Drain.pxe b/assets/data_jp/Stage/Drain.pxe similarity index 100% rename from build_jp/data/Stage/Drain.pxe rename to assets/data_jp/Stage/Drain.pxe diff --git a/build_jp/data/Stage/Drain.pxm b/assets/data_jp/Stage/Drain.pxm similarity index 100% rename from build_jp/data/Stage/Drain.pxm rename to assets/data_jp/Stage/Drain.pxm diff --git a/build_jp/data/Stage/Drain.tsc b/assets/data_jp/Stage/Drain.tsc similarity index 100% rename from build_jp/data/Stage/Drain.tsc rename to assets/data_jp/Stage/Drain.tsc diff --git a/build_jp/data/Stage/EgEnd1.pxe b/assets/data_jp/Stage/EgEnd1.pxe similarity index 100% rename from build_jp/data/Stage/EgEnd1.pxe rename to assets/data_jp/Stage/EgEnd1.pxe diff --git a/build_jp/data/Stage/EgEnd1.pxm b/assets/data_jp/Stage/EgEnd1.pxm similarity index 100% rename from build_jp/data/Stage/EgEnd1.pxm rename to assets/data_jp/Stage/EgEnd1.pxm diff --git a/build_jp/data/Stage/EgEnd1.tsc b/assets/data_jp/Stage/EgEnd1.tsc similarity index 100% rename from build_jp/data/Stage/EgEnd1.tsc rename to assets/data_jp/Stage/EgEnd1.tsc diff --git a/build_jp/data/Stage/EgEnd2.pxe b/assets/data_jp/Stage/EgEnd2.pxe similarity index 100% rename from build_jp/data/Stage/EgEnd2.pxe rename to assets/data_jp/Stage/EgEnd2.pxe diff --git a/build_jp/data/Stage/EgEnd2.pxm b/assets/data_jp/Stage/EgEnd2.pxm similarity index 100% rename from build_jp/data/Stage/EgEnd2.pxm rename to assets/data_jp/Stage/EgEnd2.pxm diff --git a/build_jp/data/Stage/EgEnd2.tsc b/assets/data_jp/Stage/EgEnd2.tsc similarity index 100% rename from build_jp/data/Stage/EgEnd2.tsc rename to assets/data_jp/Stage/EgEnd2.tsc diff --git a/build_jp/data/Stage/Egg1.pxe b/assets/data_jp/Stage/Egg1.pxe similarity index 100% rename from build_jp/data/Stage/Egg1.pxe rename to assets/data_jp/Stage/Egg1.pxe diff --git a/build_jp/data/Stage/Egg1.pxm b/assets/data_jp/Stage/Egg1.pxm similarity index 100% rename from build_jp/data/Stage/Egg1.pxm rename to assets/data_jp/Stage/Egg1.pxm diff --git a/build_jp/data/Stage/Egg1.tsc b/assets/data_jp/Stage/Egg1.tsc similarity index 100% rename from build_jp/data/Stage/Egg1.tsc rename to assets/data_jp/Stage/Egg1.tsc diff --git a/build_jp/data/Stage/Egg6.pxe b/assets/data_jp/Stage/Egg6.pxe similarity index 100% rename from build_jp/data/Stage/Egg6.pxe rename to assets/data_jp/Stage/Egg6.pxe diff --git a/build_jp/data/Stage/Egg6.pxm b/assets/data_jp/Stage/Egg6.pxm similarity index 100% rename from build_jp/data/Stage/Egg6.pxm rename to assets/data_jp/Stage/Egg6.pxm diff --git a/build_jp/data/Stage/Egg6.tsc b/assets/data_jp/Stage/Egg6.tsc similarity index 100% rename from build_jp/data/Stage/Egg6.tsc rename to assets/data_jp/Stage/Egg6.tsc diff --git a/build_jp/data/Stage/EggIn.pxa b/assets/data_jp/Stage/EggIn.pxa similarity index 100% rename from build_jp/data/Stage/EggIn.pxa rename to assets/data_jp/Stage/EggIn.pxa diff --git a/build_jp/data/Stage/EggR.pxe b/assets/data_jp/Stage/EggR.pxe similarity index 100% rename from build_jp/data/Stage/EggR.pxe rename to assets/data_jp/Stage/EggR.pxe diff --git a/build_jp/data/Stage/EggR.pxm b/assets/data_jp/Stage/EggR.pxm similarity index 100% rename from build_jp/data/Stage/EggR.pxm rename to assets/data_jp/Stage/EggR.pxm diff --git a/build_jp/data/Stage/EggR.tsc b/assets/data_jp/Stage/EggR.tsc similarity index 100% rename from build_jp/data/Stage/EggR.tsc rename to assets/data_jp/Stage/EggR.tsc diff --git a/build_jp/data/Stage/EggR2.pxe b/assets/data_jp/Stage/EggR2.pxe similarity index 100% rename from build_jp/data/Stage/EggR2.pxe rename to assets/data_jp/Stage/EggR2.pxe diff --git a/build_jp/data/Stage/EggR2.pxm b/assets/data_jp/Stage/EggR2.pxm similarity index 100% rename from build_jp/data/Stage/EggR2.pxm rename to assets/data_jp/Stage/EggR2.pxm diff --git a/build_jp/data/Stage/EggR2.tsc b/assets/data_jp/Stage/EggR2.tsc similarity index 100% rename from build_jp/data/Stage/EggR2.tsc rename to assets/data_jp/Stage/EggR2.tsc diff --git a/build_jp/data/Stage/EggX.pxa b/assets/data_jp/Stage/EggX.pxa similarity index 100% rename from build_jp/data/Stage/EggX.pxa rename to assets/data_jp/Stage/EggX.pxa diff --git a/build_jp/data/Stage/EggX.pxe b/assets/data_jp/Stage/EggX.pxe similarity index 100% rename from build_jp/data/Stage/EggX.pxe rename to assets/data_jp/Stage/EggX.pxe diff --git a/build_jp/data/Stage/EggX.pxm b/assets/data_jp/Stage/EggX.pxm similarity index 100% rename from build_jp/data/Stage/EggX.pxm rename to assets/data_jp/Stage/EggX.pxm diff --git a/build_jp/data/Stage/EggX.tsc b/assets/data_jp/Stage/EggX.tsc similarity index 100% rename from build_jp/data/Stage/EggX.tsc rename to assets/data_jp/Stage/EggX.tsc diff --git a/build_jp/data/Stage/EggX2.pxe b/assets/data_jp/Stage/EggX2.pxe similarity index 100% rename from build_jp/data/Stage/EggX2.pxe rename to assets/data_jp/Stage/EggX2.pxe diff --git a/build_jp/data/Stage/EggX2.pxm b/assets/data_jp/Stage/EggX2.pxm similarity index 100% rename from build_jp/data/Stage/EggX2.pxm rename to assets/data_jp/Stage/EggX2.pxm diff --git a/build_jp/data/Stage/EggX2.tsc b/assets/data_jp/Stage/EggX2.tsc similarity index 100% rename from build_jp/data/Stage/EggX2.tsc rename to assets/data_jp/Stage/EggX2.tsc diff --git a/build_jp/data/Stage/Eggs.pxa b/assets/data_jp/Stage/Eggs.pxa similarity index 100% rename from build_jp/data/Stage/Eggs.pxa rename to assets/data_jp/Stage/Eggs.pxa diff --git a/build_jp/data/Stage/Eggs.pxe b/assets/data_jp/Stage/Eggs.pxe similarity index 100% rename from build_jp/data/Stage/Eggs.pxe rename to assets/data_jp/Stage/Eggs.pxe diff --git a/build_jp/data/Stage/Eggs.pxm b/assets/data_jp/Stage/Eggs.pxm similarity index 100% rename from build_jp/data/Stage/Eggs.pxm rename to assets/data_jp/Stage/Eggs.pxm diff --git a/build_jp/data/Stage/Eggs.tsc b/assets/data_jp/Stage/Eggs.tsc similarity index 100% rename from build_jp/data/Stage/Eggs.tsc rename to assets/data_jp/Stage/Eggs.tsc diff --git a/build_jp/data/Stage/Eggs2.pxe b/assets/data_jp/Stage/Eggs2.pxe similarity index 100% rename from build_jp/data/Stage/Eggs2.pxe rename to assets/data_jp/Stage/Eggs2.pxe diff --git a/build_jp/data/Stage/Eggs2.pxm b/assets/data_jp/Stage/Eggs2.pxm similarity index 100% rename from build_jp/data/Stage/Eggs2.pxm rename to assets/data_jp/Stage/Eggs2.pxm diff --git a/build_jp/data/Stage/Eggs2.tsc b/assets/data_jp/Stage/Eggs2.tsc similarity index 100% rename from build_jp/data/Stage/Eggs2.tsc rename to assets/data_jp/Stage/Eggs2.tsc diff --git a/build_jp/data/Stage/Fall.pxa b/assets/data_jp/Stage/Fall.pxa similarity index 100% rename from build_jp/data/Stage/Fall.pxa rename to assets/data_jp/Stage/Fall.pxa diff --git a/build_jp/data/Stage/Fall.pxe b/assets/data_jp/Stage/Fall.pxe similarity index 100% rename from build_jp/data/Stage/Fall.pxe rename to assets/data_jp/Stage/Fall.pxe diff --git a/build_jp/data/Stage/Fall.pxm b/assets/data_jp/Stage/Fall.pxm similarity index 100% rename from build_jp/data/Stage/Fall.pxm rename to assets/data_jp/Stage/Fall.pxm diff --git a/build_jp/data/Stage/Fall.tsc b/assets/data_jp/Stage/Fall.tsc similarity index 100% rename from build_jp/data/Stage/Fall.tsc rename to assets/data_jp/Stage/Fall.tsc diff --git a/build_jp/data/Stage/Frog.pxe b/assets/data_jp/Stage/Frog.pxe similarity index 100% rename from build_jp/data/Stage/Frog.pxe rename to assets/data_jp/Stage/Frog.pxe diff --git a/build_jp/data/Stage/Frog.pxm b/assets/data_jp/Stage/Frog.pxm similarity index 100% rename from build_jp/data/Stage/Frog.pxm rename to assets/data_jp/Stage/Frog.pxm diff --git a/build_jp/data/Stage/Frog.tsc b/assets/data_jp/Stage/Frog.tsc similarity index 100% rename from build_jp/data/Stage/Frog.tsc rename to assets/data_jp/Stage/Frog.tsc diff --git a/build_jp/data/Stage/Gard.pxa b/assets/data_jp/Stage/Gard.pxa similarity index 100% rename from build_jp/data/Stage/Gard.pxa rename to assets/data_jp/Stage/Gard.pxa diff --git a/build_jp/data/Stage/Gard.pxe b/assets/data_jp/Stage/Gard.pxe similarity index 100% rename from build_jp/data/Stage/Gard.pxe rename to assets/data_jp/Stage/Gard.pxe diff --git a/build_jp/data/Stage/Gard.pxm b/assets/data_jp/Stage/Gard.pxm similarity index 100% rename from build_jp/data/Stage/Gard.pxm rename to assets/data_jp/Stage/Gard.pxm diff --git a/build_jp/data/Stage/Gard.tsc b/assets/data_jp/Stage/Gard.tsc similarity index 100% rename from build_jp/data/Stage/Gard.tsc rename to assets/data_jp/Stage/Gard.tsc diff --git a/build_jp/data/Stage/Hell.pxa b/assets/data_jp/Stage/Hell.pxa similarity index 100% rename from build_jp/data/Stage/Hell.pxa rename to assets/data_jp/Stage/Hell.pxa diff --git a/build_jp/data/Stage/Hell1.pxe b/assets/data_jp/Stage/Hell1.pxe similarity index 100% rename from build_jp/data/Stage/Hell1.pxe rename to assets/data_jp/Stage/Hell1.pxe diff --git a/build_jp/data/Stage/Hell1.pxm b/assets/data_jp/Stage/Hell1.pxm similarity index 100% rename from build_jp/data/Stage/Hell1.pxm rename to assets/data_jp/Stage/Hell1.pxm diff --git a/build_jp/data/Stage/Hell1.tsc b/assets/data_jp/Stage/Hell1.tsc similarity index 100% rename from build_jp/data/Stage/Hell1.tsc rename to assets/data_jp/Stage/Hell1.tsc diff --git a/build_jp/data/Stage/Hell2.pxe b/assets/data_jp/Stage/Hell2.pxe similarity index 100% rename from build_jp/data/Stage/Hell2.pxe rename to assets/data_jp/Stage/Hell2.pxe diff --git a/build_jp/data/Stage/Hell2.pxm b/assets/data_jp/Stage/Hell2.pxm similarity index 100% rename from build_jp/data/Stage/Hell2.pxm rename to assets/data_jp/Stage/Hell2.pxm diff --git a/build_jp/data/Stage/Hell2.tsc b/assets/data_jp/Stage/Hell2.tsc similarity index 100% rename from build_jp/data/Stage/Hell2.tsc rename to assets/data_jp/Stage/Hell2.tsc diff --git a/build_jp/data/Stage/Hell3.pxe b/assets/data_jp/Stage/Hell3.pxe similarity index 100% rename from build_jp/data/Stage/Hell3.pxe rename to assets/data_jp/Stage/Hell3.pxe diff --git a/build_jp/data/Stage/Hell3.pxm b/assets/data_jp/Stage/Hell3.pxm similarity index 100% rename from build_jp/data/Stage/Hell3.pxm rename to assets/data_jp/Stage/Hell3.pxm diff --git a/build_jp/data/Stage/Hell3.tsc b/assets/data_jp/Stage/Hell3.tsc similarity index 100% rename from build_jp/data/Stage/Hell3.tsc rename to assets/data_jp/Stage/Hell3.tsc diff --git a/build_jp/data/Stage/Hell4.pxe b/assets/data_jp/Stage/Hell4.pxe similarity index 100% rename from build_jp/data/Stage/Hell4.pxe rename to assets/data_jp/Stage/Hell4.pxe diff --git a/build_jp/data/Stage/Hell4.pxm b/assets/data_jp/Stage/Hell4.pxm similarity index 100% rename from build_jp/data/Stage/Hell4.pxm rename to assets/data_jp/Stage/Hell4.pxm diff --git a/build_jp/data/Stage/Hell4.tsc b/assets/data_jp/Stage/Hell4.tsc similarity index 100% rename from build_jp/data/Stage/Hell4.tsc rename to assets/data_jp/Stage/Hell4.tsc diff --git a/build_jp/data/Stage/Hell42.pxe b/assets/data_jp/Stage/Hell42.pxe similarity index 100% rename from build_jp/data/Stage/Hell42.pxe rename to assets/data_jp/Stage/Hell42.pxe diff --git a/build_jp/data/Stage/Hell42.pxm b/assets/data_jp/Stage/Hell42.pxm similarity index 100% rename from build_jp/data/Stage/Hell42.pxm rename to assets/data_jp/Stage/Hell42.pxm diff --git a/build_jp/data/Stage/Hell42.tsc b/assets/data_jp/Stage/Hell42.tsc similarity index 100% rename from build_jp/data/Stage/Hell42.tsc rename to assets/data_jp/Stage/Hell42.tsc diff --git a/build_jp/data/Stage/Island.pxe b/assets/data_jp/Stage/Island.pxe similarity index 100% rename from build_jp/data/Stage/Island.pxe rename to assets/data_jp/Stage/Island.pxe diff --git a/build_jp/data/Stage/Island.pxm b/assets/data_jp/Stage/Island.pxm similarity index 100% rename from build_jp/data/Stage/Island.pxm rename to assets/data_jp/Stage/Island.pxm diff --git a/build_jp/data/Stage/Island.tsc b/assets/data_jp/Stage/Island.tsc similarity index 100% rename from build_jp/data/Stage/Island.tsc rename to assets/data_jp/Stage/Island.tsc diff --git a/build_jp/data/Stage/Itoh.pxe b/assets/data_jp/Stage/Itoh.pxe similarity index 100% rename from build_jp/data/Stage/Itoh.pxe rename to assets/data_jp/Stage/Itoh.pxe diff --git a/build_jp/data/Stage/Itoh.pxm b/assets/data_jp/Stage/Itoh.pxm similarity index 100% rename from build_jp/data/Stage/Itoh.pxm rename to assets/data_jp/Stage/Itoh.pxm diff --git a/build_jp/data/Stage/Itoh.tsc b/assets/data_jp/Stage/Itoh.tsc similarity index 100% rename from build_jp/data/Stage/Itoh.tsc rename to assets/data_jp/Stage/Itoh.tsc diff --git a/build_jp/data/Stage/Jail.pxa b/assets/data_jp/Stage/Jail.pxa similarity index 100% rename from build_jp/data/Stage/Jail.pxa rename to assets/data_jp/Stage/Jail.pxa diff --git a/build_jp/data/Stage/Jail1.pxe b/assets/data_jp/Stage/Jail1.pxe similarity index 100% rename from build_jp/data/Stage/Jail1.pxe rename to assets/data_jp/Stage/Jail1.pxe diff --git a/build_jp/data/Stage/Jail1.pxm b/assets/data_jp/Stage/Jail1.pxm similarity index 100% rename from build_jp/data/Stage/Jail1.pxm rename to assets/data_jp/Stage/Jail1.pxm diff --git a/build_jp/data/Stage/Jail1.tsc b/assets/data_jp/Stage/Jail1.tsc similarity index 100% rename from build_jp/data/Stage/Jail1.tsc rename to assets/data_jp/Stage/Jail1.tsc diff --git a/build_jp/data/Stage/Jail2.pxe b/assets/data_jp/Stage/Jail2.pxe similarity index 100% rename from build_jp/data/Stage/Jail2.pxe rename to assets/data_jp/Stage/Jail2.pxe diff --git a/build_jp/data/Stage/Jail2.pxm b/assets/data_jp/Stage/Jail2.pxm similarity index 100% rename from build_jp/data/Stage/Jail2.pxm rename to assets/data_jp/Stage/Jail2.pxm diff --git a/build_jp/data/Stage/Jail2.tsc b/assets/data_jp/Stage/Jail2.tsc similarity index 100% rename from build_jp/data/Stage/Jail2.tsc rename to assets/data_jp/Stage/Jail2.tsc diff --git a/build_jp/data/Stage/Jenka1.pxe b/assets/data_jp/Stage/Jenka1.pxe similarity index 100% rename from build_jp/data/Stage/Jenka1.pxe rename to assets/data_jp/Stage/Jenka1.pxe diff --git a/build_jp/data/Stage/Jenka1.pxm b/assets/data_jp/Stage/Jenka1.pxm similarity index 100% rename from build_jp/data/Stage/Jenka1.pxm rename to assets/data_jp/Stage/Jenka1.pxm diff --git a/build_jp/data/Stage/Jenka1.tsc b/assets/data_jp/Stage/Jenka1.tsc similarity index 100% rename from build_jp/data/Stage/Jenka1.tsc rename to assets/data_jp/Stage/Jenka1.tsc diff --git a/build_jp/data/Stage/Jenka2.pxe b/assets/data_jp/Stage/Jenka2.pxe similarity index 100% rename from build_jp/data/Stage/Jenka2.pxe rename to assets/data_jp/Stage/Jenka2.pxe diff --git a/build_jp/data/Stage/Jenka2.pxm b/assets/data_jp/Stage/Jenka2.pxm similarity index 100% rename from build_jp/data/Stage/Jenka2.pxm rename to assets/data_jp/Stage/Jenka2.pxm diff --git a/build_jp/data/Stage/Jenka2.tsc b/assets/data_jp/Stage/Jenka2.tsc similarity index 100% rename from build_jp/data/Stage/Jenka2.tsc rename to assets/data_jp/Stage/Jenka2.tsc diff --git a/build_jp/data/Stage/Kings.pxe b/assets/data_jp/Stage/Kings.pxe similarity index 100% rename from build_jp/data/Stage/Kings.pxe rename to assets/data_jp/Stage/Kings.pxe diff --git a/build_jp/data/Stage/Kings.pxm b/assets/data_jp/Stage/Kings.pxm similarity index 100% rename from build_jp/data/Stage/Kings.pxm rename to assets/data_jp/Stage/Kings.pxm diff --git a/build_jp/data/Stage/Kings.tsc b/assets/data_jp/Stage/Kings.tsc similarity index 100% rename from build_jp/data/Stage/Kings.tsc rename to assets/data_jp/Stage/Kings.tsc diff --git a/build_jp/data/Stage/Labo.pxa b/assets/data_jp/Stage/Labo.pxa similarity index 100% rename from build_jp/data/Stage/Labo.pxa rename to assets/data_jp/Stage/Labo.pxa diff --git a/build_jp/data/Stage/Little.pxe b/assets/data_jp/Stage/Little.pxe similarity index 100% rename from build_jp/data/Stage/Little.pxe rename to assets/data_jp/Stage/Little.pxe diff --git a/build_jp/data/Stage/Little.pxm b/assets/data_jp/Stage/Little.pxm similarity index 100% rename from build_jp/data/Stage/Little.pxm rename to assets/data_jp/Stage/Little.pxm diff --git a/build_jp/data/Stage/Little.tsc b/assets/data_jp/Stage/Little.tsc similarity index 100% rename from build_jp/data/Stage/Little.tsc rename to assets/data_jp/Stage/Little.tsc diff --git a/build_jp/data/Stage/Lounge.pxe b/assets/data_jp/Stage/Lounge.pxe similarity index 100% rename from build_jp/data/Stage/Lounge.pxe rename to assets/data_jp/Stage/Lounge.pxe diff --git a/build_jp/data/Stage/Lounge.pxm b/assets/data_jp/Stage/Lounge.pxm similarity index 100% rename from build_jp/data/Stage/Lounge.pxm rename to assets/data_jp/Stage/Lounge.pxm diff --git a/build_jp/data/Stage/Lounge.tsc b/assets/data_jp/Stage/Lounge.tsc similarity index 100% rename from build_jp/data/Stage/Lounge.tsc rename to assets/data_jp/Stage/Lounge.tsc diff --git a/build_jp/data/Stage/Malco.pxe b/assets/data_jp/Stage/Malco.pxe similarity index 100% rename from build_jp/data/Stage/Malco.pxe rename to assets/data_jp/Stage/Malco.pxe diff --git a/build_jp/data/Stage/Malco.pxm b/assets/data_jp/Stage/Malco.pxm similarity index 100% rename from build_jp/data/Stage/Malco.pxm rename to assets/data_jp/Stage/Malco.pxm diff --git a/build_jp/data/Stage/Malco.tsc b/assets/data_jp/Stage/Malco.tsc similarity index 100% rename from build_jp/data/Stage/Malco.tsc rename to assets/data_jp/Stage/Malco.tsc diff --git a/build_jp/data/Stage/Mapi.pxe b/assets/data_jp/Stage/Mapi.pxe similarity index 100% rename from build_jp/data/Stage/Mapi.pxe rename to assets/data_jp/Stage/Mapi.pxe diff --git a/build_jp/data/Stage/Mapi.pxm b/assets/data_jp/Stage/Mapi.pxm similarity index 100% rename from build_jp/data/Stage/Mapi.pxm rename to assets/data_jp/Stage/Mapi.pxm diff --git a/build_jp/data/Stage/Mapi.tsc b/assets/data_jp/Stage/Mapi.tsc similarity index 100% rename from build_jp/data/Stage/Mapi.tsc rename to assets/data_jp/Stage/Mapi.tsc diff --git a/build_jp/data/Stage/Maze.pxa b/assets/data_jp/Stage/Maze.pxa similarity index 100% rename from build_jp/data/Stage/Maze.pxa rename to assets/data_jp/Stage/Maze.pxa diff --git a/build_jp/data/Stage/MazeA.pxe b/assets/data_jp/Stage/MazeA.pxe similarity index 100% rename from build_jp/data/Stage/MazeA.pxe rename to assets/data_jp/Stage/MazeA.pxe diff --git a/build_jp/data/Stage/MazeA.pxm b/assets/data_jp/Stage/MazeA.pxm similarity index 100% rename from build_jp/data/Stage/MazeA.pxm rename to assets/data_jp/Stage/MazeA.pxm diff --git a/build_jp/data/Stage/MazeA.tsc b/assets/data_jp/Stage/MazeA.tsc similarity index 100% rename from build_jp/data/Stage/MazeA.tsc rename to assets/data_jp/Stage/MazeA.tsc diff --git a/build_jp/data/Stage/MazeB.pxe b/assets/data_jp/Stage/MazeB.pxe similarity index 100% rename from build_jp/data/Stage/MazeB.pxe rename to assets/data_jp/Stage/MazeB.pxe diff --git a/build_jp/data/Stage/MazeB.pxm b/assets/data_jp/Stage/MazeB.pxm similarity index 100% rename from build_jp/data/Stage/MazeB.pxm rename to assets/data_jp/Stage/MazeB.pxm diff --git a/build_jp/data/Stage/MazeB.tsc b/assets/data_jp/Stage/MazeB.tsc similarity index 100% rename from build_jp/data/Stage/MazeB.tsc rename to assets/data_jp/Stage/MazeB.tsc diff --git a/build_jp/data/Stage/MazeD.pxe b/assets/data_jp/Stage/MazeD.pxe similarity index 100% rename from build_jp/data/Stage/MazeD.pxe rename to assets/data_jp/Stage/MazeD.pxe diff --git a/build_jp/data/Stage/MazeD.pxm b/assets/data_jp/Stage/MazeD.pxm similarity index 100% rename from build_jp/data/Stage/MazeD.pxm rename to assets/data_jp/Stage/MazeD.pxm diff --git a/build_jp/data/Stage/MazeD.tsc b/assets/data_jp/Stage/MazeD.tsc similarity index 100% rename from build_jp/data/Stage/MazeD.tsc rename to assets/data_jp/Stage/MazeD.tsc diff --git a/build_jp/data/Stage/MazeH.pxe b/assets/data_jp/Stage/MazeH.pxe similarity index 100% rename from build_jp/data/Stage/MazeH.pxe rename to assets/data_jp/Stage/MazeH.pxe diff --git a/build_jp/data/Stage/MazeH.pxm b/assets/data_jp/Stage/MazeH.pxm similarity index 100% rename from build_jp/data/Stage/MazeH.pxm rename to assets/data_jp/Stage/MazeH.pxm diff --git a/build_jp/data/Stage/MazeH.tsc b/assets/data_jp/Stage/MazeH.tsc similarity index 100% rename from build_jp/data/Stage/MazeH.tsc rename to assets/data_jp/Stage/MazeH.tsc diff --git a/build_jp/data/Stage/MazeI.pxe b/assets/data_jp/Stage/MazeI.pxe similarity index 100% rename from build_jp/data/Stage/MazeI.pxe rename to assets/data_jp/Stage/MazeI.pxe diff --git a/build_jp/data/Stage/MazeI.pxm b/assets/data_jp/Stage/MazeI.pxm similarity index 100% rename from build_jp/data/Stage/MazeI.pxm rename to assets/data_jp/Stage/MazeI.pxm diff --git a/build_jp/data/Stage/MazeI.tsc b/assets/data_jp/Stage/MazeI.tsc similarity index 100% rename from build_jp/data/Stage/MazeI.tsc rename to assets/data_jp/Stage/MazeI.tsc diff --git a/build_jp/data/Stage/MazeM.pxe b/assets/data_jp/Stage/MazeM.pxe similarity index 100% rename from build_jp/data/Stage/MazeM.pxe rename to assets/data_jp/Stage/MazeM.pxe diff --git a/build_jp/data/Stage/MazeM.pxm b/assets/data_jp/Stage/MazeM.pxm similarity index 100% rename from build_jp/data/Stage/MazeM.pxm rename to assets/data_jp/Stage/MazeM.pxm diff --git a/build_jp/data/Stage/MazeM.tsc b/assets/data_jp/Stage/MazeM.tsc similarity index 100% rename from build_jp/data/Stage/MazeM.tsc rename to assets/data_jp/Stage/MazeM.tsc diff --git a/build_jp/data/Stage/MazeO.pxe b/assets/data_jp/Stage/MazeO.pxe similarity index 100% rename from build_jp/data/Stage/MazeO.pxe rename to assets/data_jp/Stage/MazeO.pxe diff --git a/build_jp/data/Stage/MazeO.pxm b/assets/data_jp/Stage/MazeO.pxm similarity index 100% rename from build_jp/data/Stage/MazeO.pxm rename to assets/data_jp/Stage/MazeO.pxm diff --git a/build_jp/data/Stage/MazeO.tsc b/assets/data_jp/Stage/MazeO.tsc similarity index 100% rename from build_jp/data/Stage/MazeO.tsc rename to assets/data_jp/Stage/MazeO.tsc diff --git a/build_jp/data/Stage/MazeS.pxe b/assets/data_jp/Stage/MazeS.pxe similarity index 100% rename from build_jp/data/Stage/MazeS.pxe rename to assets/data_jp/Stage/MazeS.pxe diff --git a/build_jp/data/Stage/MazeS.pxm b/assets/data_jp/Stage/MazeS.pxm similarity index 100% rename from build_jp/data/Stage/MazeS.pxm rename to assets/data_jp/Stage/MazeS.pxm diff --git a/build_jp/data/Stage/MazeS.tsc b/assets/data_jp/Stage/MazeS.tsc similarity index 100% rename from build_jp/data/Stage/MazeS.tsc rename to assets/data_jp/Stage/MazeS.tsc diff --git a/build_jp/data/Stage/MazeW.pxe b/assets/data_jp/Stage/MazeW.pxe similarity index 100% rename from build_jp/data/Stage/MazeW.pxe rename to assets/data_jp/Stage/MazeW.pxe diff --git a/build_jp/data/Stage/MazeW.pxm b/assets/data_jp/Stage/MazeW.pxm similarity index 100% rename from build_jp/data/Stage/MazeW.pxm rename to assets/data_jp/Stage/MazeW.pxm diff --git a/build_jp/data/Stage/MazeW.tsc b/assets/data_jp/Stage/MazeW.tsc similarity index 100% rename from build_jp/data/Stage/MazeW.tsc rename to assets/data_jp/Stage/MazeW.tsc diff --git a/build_jp/data/Stage/MiBox.pxe b/assets/data_jp/Stage/MiBox.pxe similarity index 100% rename from build_jp/data/Stage/MiBox.pxe rename to assets/data_jp/Stage/MiBox.pxe diff --git a/build_jp/data/Stage/MiBox.pxm b/assets/data_jp/Stage/MiBox.pxm similarity index 100% rename from build_jp/data/Stage/MiBox.pxm rename to assets/data_jp/Stage/MiBox.pxm diff --git a/build_jp/data/Stage/MiBox.tsc b/assets/data_jp/Stage/MiBox.tsc similarity index 100% rename from build_jp/data/Stage/MiBox.tsc rename to assets/data_jp/Stage/MiBox.tsc diff --git a/build_jp/data/Stage/Mimi.pxa b/assets/data_jp/Stage/Mimi.pxa similarity index 100% rename from build_jp/data/Stage/Mimi.pxa rename to assets/data_jp/Stage/Mimi.pxa diff --git a/build_jp/data/Stage/Mimi.pxe b/assets/data_jp/Stage/Mimi.pxe similarity index 100% rename from build_jp/data/Stage/Mimi.pxe rename to assets/data_jp/Stage/Mimi.pxe diff --git a/build_jp/data/Stage/Mimi.pxm b/assets/data_jp/Stage/Mimi.pxm similarity index 100% rename from build_jp/data/Stage/Mimi.pxm rename to assets/data_jp/Stage/Mimi.pxm diff --git a/build_jp/data/Stage/Mimi.tsc b/assets/data_jp/Stage/Mimi.tsc similarity index 100% rename from build_jp/data/Stage/Mimi.tsc rename to assets/data_jp/Stage/Mimi.tsc diff --git a/build_jp/data/Stage/Momo.pxe b/assets/data_jp/Stage/Momo.pxe similarity index 100% rename from build_jp/data/Stage/Momo.pxe rename to assets/data_jp/Stage/Momo.pxe diff --git a/build_jp/data/Stage/Momo.pxm b/assets/data_jp/Stage/Momo.pxm similarity index 100% rename from build_jp/data/Stage/Momo.pxm rename to assets/data_jp/Stage/Momo.pxm diff --git a/build_jp/data/Stage/Momo.tsc b/assets/data_jp/Stage/Momo.tsc similarity index 100% rename from build_jp/data/Stage/Momo.tsc rename to assets/data_jp/Stage/Momo.tsc diff --git a/build_jp/data/Stage/New.pxe b/assets/data_jp/Stage/New.pxe similarity index 100% rename from build_jp/data/Stage/New.pxe rename to assets/data_jp/Stage/New.pxe diff --git a/build_jp/data/Stage/Oside.pxa b/assets/data_jp/Stage/Oside.pxa similarity index 100% rename from build_jp/data/Stage/Oside.pxa rename to assets/data_jp/Stage/Oside.pxa diff --git a/build_jp/data/Stage/Oside.pxe b/assets/data_jp/Stage/Oside.pxe similarity index 100% rename from build_jp/data/Stage/Oside.pxe rename to assets/data_jp/Stage/Oside.pxe diff --git a/build_jp/data/Stage/Oside.pxm b/assets/data_jp/Stage/Oside.pxm similarity index 100% rename from build_jp/data/Stage/Oside.pxm rename to assets/data_jp/Stage/Oside.pxm diff --git a/build_jp/data/Stage/Oside.tsc b/assets/data_jp/Stage/Oside.tsc similarity index 100% rename from build_jp/data/Stage/Oside.tsc rename to assets/data_jp/Stage/Oside.tsc diff --git a/build_jp/data/Stage/Ostep.pxe b/assets/data_jp/Stage/Ostep.pxe similarity index 100% rename from build_jp/data/Stage/Ostep.pxe rename to assets/data_jp/Stage/Ostep.pxe diff --git a/build_jp/data/Stage/Ostep.pxm b/assets/data_jp/Stage/Ostep.pxm similarity index 100% rename from build_jp/data/Stage/Ostep.pxm rename to assets/data_jp/Stage/Ostep.pxm diff --git a/build_jp/data/Stage/Ostep.tsc b/assets/data_jp/Stage/Ostep.tsc similarity index 100% rename from build_jp/data/Stage/Ostep.tsc rename to assets/data_jp/Stage/Ostep.tsc diff --git a/build_jp/data/Stage/Pens.pxa b/assets/data_jp/Stage/Pens.pxa similarity index 100% rename from build_jp/data/Stage/Pens.pxa rename to assets/data_jp/Stage/Pens.pxa diff --git a/build_jp/data/Stage/Pens1.pxe b/assets/data_jp/Stage/Pens1.pxe similarity index 100% rename from build_jp/data/Stage/Pens1.pxe rename to assets/data_jp/Stage/Pens1.pxe diff --git a/build_jp/data/Stage/Pens1.pxm b/assets/data_jp/Stage/Pens1.pxm similarity index 100% rename from build_jp/data/Stage/Pens1.pxm rename to assets/data_jp/Stage/Pens1.pxm diff --git a/build_jp/data/Stage/Pens1.tsc b/assets/data_jp/Stage/Pens1.tsc similarity index 100% rename from build_jp/data/Stage/Pens1.tsc rename to assets/data_jp/Stage/Pens1.tsc diff --git a/build_jp/data/Stage/Pens2.pxe b/assets/data_jp/Stage/Pens2.pxe similarity index 100% rename from build_jp/data/Stage/Pens2.pxe rename to assets/data_jp/Stage/Pens2.pxe diff --git a/build_jp/data/Stage/Pens2.pxm b/assets/data_jp/Stage/Pens2.pxm similarity index 100% rename from build_jp/data/Stage/Pens2.pxm rename to assets/data_jp/Stage/Pens2.pxm diff --git a/build_jp/data/Stage/Pens2.tsc b/assets/data_jp/Stage/Pens2.tsc similarity index 100% rename from build_jp/data/Stage/Pens2.tsc rename to assets/data_jp/Stage/Pens2.tsc diff --git a/build_jp/data/Stage/Pixel.pxe b/assets/data_jp/Stage/Pixel.pxe similarity index 100% rename from build_jp/data/Stage/Pixel.pxe rename to assets/data_jp/Stage/Pixel.pxe diff --git a/build_jp/data/Stage/Pixel.pxm b/assets/data_jp/Stage/Pixel.pxm similarity index 100% rename from build_jp/data/Stage/Pixel.pxm rename to assets/data_jp/Stage/Pixel.pxm diff --git a/build_jp/data/Stage/Pixel.tsc b/assets/data_jp/Stage/Pixel.tsc similarity index 100% rename from build_jp/data/Stage/Pixel.tsc rename to assets/data_jp/Stage/Pixel.tsc diff --git a/build_jp/data/Stage/Plant.pxe b/assets/data_jp/Stage/Plant.pxe similarity index 100% rename from build_jp/data/Stage/Plant.pxe rename to assets/data_jp/Stage/Plant.pxe diff --git a/build_jp/data/Stage/Plant.pxm b/assets/data_jp/Stage/Plant.pxm similarity index 100% rename from build_jp/data/Stage/Plant.pxm rename to assets/data_jp/Stage/Plant.pxm diff --git a/build_jp/data/Stage/Plant.tsc b/assets/data_jp/Stage/Plant.tsc similarity index 100% rename from build_jp/data/Stage/Plant.tsc rename to assets/data_jp/Stage/Plant.tsc diff --git a/build_jp/data/Stage/Pole.pxe b/assets/data_jp/Stage/Pole.pxe similarity index 100% rename from build_jp/data/Stage/Pole.pxe rename to assets/data_jp/Stage/Pole.pxe diff --git a/build_jp/data/Stage/Pole.pxm b/assets/data_jp/Stage/Pole.pxm similarity index 100% rename from build_jp/data/Stage/Pole.pxm rename to assets/data_jp/Stage/Pole.pxm diff --git a/build_jp/data/Stage/Pole.tsc b/assets/data_jp/Stage/Pole.tsc similarity index 100% rename from build_jp/data/Stage/Pole.tsc rename to assets/data_jp/Stage/Pole.tsc diff --git a/build_jp/data/Stage/Pool.pxe b/assets/data_jp/Stage/Pool.pxe similarity index 100% rename from build_jp/data/Stage/Pool.pxe rename to assets/data_jp/Stage/Pool.pxe diff --git a/build_jp/data/Stage/Pool.pxm b/assets/data_jp/Stage/Pool.pxm similarity index 100% rename from build_jp/data/Stage/Pool.pxm rename to assets/data_jp/Stage/Pool.pxm diff --git a/build_jp/data/Stage/Pool.tsc b/assets/data_jp/Stage/Pool.tsc similarity index 100% rename from build_jp/data/Stage/Pool.tsc rename to assets/data_jp/Stage/Pool.tsc diff --git a/build_jp/data/Stage/Prefa1.pxe b/assets/data_jp/Stage/Prefa1.pxe similarity index 100% rename from build_jp/data/Stage/Prefa1.pxe rename to assets/data_jp/Stage/Prefa1.pxe diff --git a/build_jp/data/Stage/Prefa1.pxm b/assets/data_jp/Stage/Prefa1.pxm similarity index 100% rename from build_jp/data/Stage/Prefa1.pxm rename to assets/data_jp/Stage/Prefa1.pxm diff --git a/build_jp/data/Stage/Prefa1.tsc b/assets/data_jp/Stage/Prefa1.tsc similarity index 100% rename from build_jp/data/Stage/Prefa1.tsc rename to assets/data_jp/Stage/Prefa1.tsc diff --git a/build_jp/data/Stage/Prefa2.pxe b/assets/data_jp/Stage/Prefa2.pxe similarity index 100% rename from build_jp/data/Stage/Prefa2.pxe rename to assets/data_jp/Stage/Prefa2.pxe diff --git a/build_jp/data/Stage/Prefa2.pxm b/assets/data_jp/Stage/Prefa2.pxm similarity index 100% rename from build_jp/data/Stage/Prefa2.pxm rename to assets/data_jp/Stage/Prefa2.pxm diff --git a/build_jp/data/Stage/Prefa2.tsc b/assets/data_jp/Stage/Prefa2.tsc similarity index 100% rename from build_jp/data/Stage/Prefa2.tsc rename to assets/data_jp/Stage/Prefa2.tsc diff --git a/build_jp/data/Stage/Priso1.pxe b/assets/data_jp/Stage/Priso1.pxe similarity index 100% rename from build_jp/data/Stage/Priso1.pxe rename to assets/data_jp/Stage/Priso1.pxe diff --git a/build_jp/data/Stage/Priso1.pxm b/assets/data_jp/Stage/Priso1.pxm similarity index 100% rename from build_jp/data/Stage/Priso1.pxm rename to assets/data_jp/Stage/Priso1.pxm diff --git a/build_jp/data/Stage/Priso1.tsc b/assets/data_jp/Stage/Priso1.tsc similarity index 100% rename from build_jp/data/Stage/Priso1.tsc rename to assets/data_jp/Stage/Priso1.tsc diff --git a/build_jp/data/Stage/Priso2.pxe b/assets/data_jp/Stage/Priso2.pxe similarity index 100% rename from build_jp/data/Stage/Priso2.pxe rename to assets/data_jp/Stage/Priso2.pxe diff --git a/build_jp/data/Stage/Priso2.pxm b/assets/data_jp/Stage/Priso2.pxm similarity index 100% rename from build_jp/data/Stage/Priso2.pxm rename to assets/data_jp/Stage/Priso2.pxm diff --git a/build_jp/data/Stage/Priso2.tsc b/assets/data_jp/Stage/Priso2.tsc similarity index 100% rename from build_jp/data/Stage/Priso2.tsc rename to assets/data_jp/Stage/Priso2.tsc diff --git a/build_jp/data/Stage/Prt0.pbm b/assets/data_jp/Stage/Prt0.pbm similarity index 100% rename from build_jp/data/Stage/Prt0.pbm rename to assets/data_jp/Stage/Prt0.pbm diff --git a/build_jp/data/Stage/PrtAlmond.pbm b/assets/data_jp/Stage/PrtAlmond.pbm similarity index 100% rename from build_jp/data/Stage/PrtAlmond.pbm rename to assets/data_jp/Stage/PrtAlmond.pbm diff --git a/build_jp/data/Stage/PrtBarr.pbm b/assets/data_jp/Stage/PrtBarr.pbm similarity index 100% rename from build_jp/data/Stage/PrtBarr.pbm rename to assets/data_jp/Stage/PrtBarr.pbm diff --git a/build_jp/data/Stage/PrtCave.pbm b/assets/data_jp/Stage/PrtCave.pbm similarity index 100% rename from build_jp/data/Stage/PrtCave.pbm rename to assets/data_jp/Stage/PrtCave.pbm diff --git a/build_jp/data/Stage/PrtCent.pbm b/assets/data_jp/Stage/PrtCent.pbm similarity index 100% rename from build_jp/data/Stage/PrtCent.pbm rename to assets/data_jp/Stage/PrtCent.pbm diff --git a/build_jp/data/Stage/PrtEggIn.pbm b/assets/data_jp/Stage/PrtEggIn.pbm similarity index 100% rename from build_jp/data/Stage/PrtEggIn.pbm rename to assets/data_jp/Stage/PrtEggIn.pbm diff --git a/build_jp/data/Stage/PrtEggX.pbm b/assets/data_jp/Stage/PrtEggX.pbm similarity index 100% rename from build_jp/data/Stage/PrtEggX.pbm rename to assets/data_jp/Stage/PrtEggX.pbm diff --git a/build_jp/data/Stage/PrtEggs.pbm b/assets/data_jp/Stage/PrtEggs.pbm similarity index 100% rename from build_jp/data/Stage/PrtEggs.pbm rename to assets/data_jp/Stage/PrtEggs.pbm diff --git a/build_jp/data/Stage/PrtFall.pbm b/assets/data_jp/Stage/PrtFall.pbm similarity index 100% rename from build_jp/data/Stage/PrtFall.pbm rename to assets/data_jp/Stage/PrtFall.pbm diff --git a/build_jp/data/Stage/PrtGard.pbm b/assets/data_jp/Stage/PrtGard.pbm similarity index 100% rename from build_jp/data/Stage/PrtGard.pbm rename to assets/data_jp/Stage/PrtGard.pbm diff --git a/build_jp/data/Stage/PrtHell.pbm b/assets/data_jp/Stage/PrtHell.pbm similarity index 100% rename from build_jp/data/Stage/PrtHell.pbm rename to assets/data_jp/Stage/PrtHell.pbm diff --git a/build_jp/data/Stage/PrtJail.pbm b/assets/data_jp/Stage/PrtJail.pbm similarity index 100% rename from build_jp/data/Stage/PrtJail.pbm rename to assets/data_jp/Stage/PrtJail.pbm diff --git a/build_jp/data/Stage/PrtLabo.pbm b/assets/data_jp/Stage/PrtLabo.pbm similarity index 100% rename from build_jp/data/Stage/PrtLabo.pbm rename to assets/data_jp/Stage/PrtLabo.pbm diff --git a/build_jp/data/Stage/PrtMaze.pbm b/assets/data_jp/Stage/PrtMaze.pbm similarity index 100% rename from build_jp/data/Stage/PrtMaze.pbm rename to assets/data_jp/Stage/PrtMaze.pbm diff --git a/build_jp/data/Stage/PrtMimi.pbm b/assets/data_jp/Stage/PrtMimi.pbm similarity index 100% rename from build_jp/data/Stage/PrtMimi.pbm rename to assets/data_jp/Stage/PrtMimi.pbm diff --git a/build_jp/data/Stage/PrtOside.pbm b/assets/data_jp/Stage/PrtOside.pbm similarity index 100% rename from build_jp/data/Stage/PrtOside.pbm rename to assets/data_jp/Stage/PrtOside.pbm diff --git a/build_jp/data/Stage/PrtPens.pbm b/assets/data_jp/Stage/PrtPens.pbm similarity index 100% rename from build_jp/data/Stage/PrtPens.pbm rename to assets/data_jp/Stage/PrtPens.pbm diff --git a/build_jp/data/Stage/PrtRiver.pbm b/assets/data_jp/Stage/PrtRiver.pbm similarity index 100% rename from build_jp/data/Stage/PrtRiver.pbm rename to assets/data_jp/Stage/PrtRiver.pbm diff --git a/build_jp/data/Stage/PrtSand.pbm b/assets/data_jp/Stage/PrtSand.pbm similarity index 100% rename from build_jp/data/Stage/PrtSand.pbm rename to assets/data_jp/Stage/PrtSand.pbm diff --git a/build_jp/data/Stage/PrtStore.pbm b/assets/data_jp/Stage/PrtStore.pbm similarity index 100% rename from build_jp/data/Stage/PrtStore.pbm rename to assets/data_jp/Stage/PrtStore.pbm diff --git a/build_jp/data/Stage/PrtWeed.pbm b/assets/data_jp/Stage/PrtWeed.pbm similarity index 100% rename from build_jp/data/Stage/PrtWeed.pbm rename to assets/data_jp/Stage/PrtWeed.pbm diff --git a/build_jp/data/Stage/PrtWhite.pbm b/assets/data_jp/Stage/PrtWhite.pbm similarity index 100% rename from build_jp/data/Stage/PrtWhite.pbm rename to assets/data_jp/Stage/PrtWhite.pbm diff --git a/build_jp/data/Stage/Ring1.pxe b/assets/data_jp/Stage/Ring1.pxe similarity index 100% rename from build_jp/data/Stage/Ring1.pxe rename to assets/data_jp/Stage/Ring1.pxe diff --git a/build_jp/data/Stage/Ring1.pxm b/assets/data_jp/Stage/Ring1.pxm similarity index 100% rename from build_jp/data/Stage/Ring1.pxm rename to assets/data_jp/Stage/Ring1.pxm diff --git a/build_jp/data/Stage/Ring1.tsc b/assets/data_jp/Stage/Ring1.tsc similarity index 100% rename from build_jp/data/Stage/Ring1.tsc rename to assets/data_jp/Stage/Ring1.tsc diff --git a/build_jp/data/Stage/Ring2.pxe b/assets/data_jp/Stage/Ring2.pxe similarity index 100% rename from build_jp/data/Stage/Ring2.pxe rename to assets/data_jp/Stage/Ring2.pxe diff --git a/build_jp/data/Stage/Ring2.pxm b/assets/data_jp/Stage/Ring2.pxm similarity index 100% rename from build_jp/data/Stage/Ring2.pxm rename to assets/data_jp/Stage/Ring2.pxm diff --git a/build_jp/data/Stage/Ring2.tsc b/assets/data_jp/Stage/Ring2.tsc similarity index 100% rename from build_jp/data/Stage/Ring2.tsc rename to assets/data_jp/Stage/Ring2.tsc diff --git a/build_jp/data/Stage/Ring3.pxe b/assets/data_jp/Stage/Ring3.pxe similarity index 100% rename from build_jp/data/Stage/Ring3.pxe rename to assets/data_jp/Stage/Ring3.pxe diff --git a/build_jp/data/Stage/Ring3.pxm b/assets/data_jp/Stage/Ring3.pxm similarity index 100% rename from build_jp/data/Stage/Ring3.pxm rename to assets/data_jp/Stage/Ring3.pxm diff --git a/build_jp/data/Stage/Ring3.tsc b/assets/data_jp/Stage/Ring3.tsc similarity index 100% rename from build_jp/data/Stage/Ring3.tsc rename to assets/data_jp/Stage/Ring3.tsc diff --git a/build_jp/data/Stage/River.pxa b/assets/data_jp/Stage/River.pxa similarity index 100% rename from build_jp/data/Stage/River.pxa rename to assets/data_jp/Stage/River.pxa diff --git a/build_jp/data/Stage/River.pxe b/assets/data_jp/Stage/River.pxe similarity index 100% rename from build_jp/data/Stage/River.pxe rename to assets/data_jp/Stage/River.pxe diff --git a/build_jp/data/Stage/River.pxm b/assets/data_jp/Stage/River.pxm similarity index 100% rename from build_jp/data/Stage/River.pxm rename to assets/data_jp/Stage/River.pxm diff --git a/build_jp/data/Stage/River.tsc b/assets/data_jp/Stage/River.tsc similarity index 100% rename from build_jp/data/Stage/River.tsc rename to assets/data_jp/Stage/River.tsc diff --git a/build_jp/data/Stage/Sand.pxa b/assets/data_jp/Stage/Sand.pxa similarity index 100% rename from build_jp/data/Stage/Sand.pxa rename to assets/data_jp/Stage/Sand.pxa diff --git a/build_jp/data/Stage/Sand.pxe b/assets/data_jp/Stage/Sand.pxe similarity index 100% rename from build_jp/data/Stage/Sand.pxe rename to assets/data_jp/Stage/Sand.pxe diff --git a/build_jp/data/Stage/Sand.pxm b/assets/data_jp/Stage/Sand.pxm similarity index 100% rename from build_jp/data/Stage/Sand.pxm rename to assets/data_jp/Stage/Sand.pxm diff --git a/build_jp/data/Stage/Sand.tsc b/assets/data_jp/Stage/Sand.tsc similarity index 100% rename from build_jp/data/Stage/Sand.tsc rename to assets/data_jp/Stage/Sand.tsc diff --git a/build_jp/data/Stage/SandE.pxe b/assets/data_jp/Stage/SandE.pxe similarity index 100% rename from build_jp/data/Stage/SandE.pxe rename to assets/data_jp/Stage/SandE.pxe diff --git a/build_jp/data/Stage/SandE.pxm b/assets/data_jp/Stage/SandE.pxm similarity index 100% rename from build_jp/data/Stage/SandE.pxm rename to assets/data_jp/Stage/SandE.pxm diff --git a/build_jp/data/Stage/SandE.tsc b/assets/data_jp/Stage/SandE.tsc similarity index 100% rename from build_jp/data/Stage/SandE.tsc rename to assets/data_jp/Stage/SandE.tsc diff --git a/build_jp/data/Stage/Santa.pxe b/assets/data_jp/Stage/Santa.pxe similarity index 100% rename from build_jp/data/Stage/Santa.pxe rename to assets/data_jp/Stage/Santa.pxe diff --git a/build_jp/data/Stage/Santa.pxm b/assets/data_jp/Stage/Santa.pxm similarity index 100% rename from build_jp/data/Stage/Santa.pxm rename to assets/data_jp/Stage/Santa.pxm diff --git a/build_jp/data/Stage/Santa.tsc b/assets/data_jp/Stage/Santa.tsc similarity index 100% rename from build_jp/data/Stage/Santa.tsc rename to assets/data_jp/Stage/Santa.tsc diff --git a/build_jp/data/Stage/Shelt.pxa b/assets/data_jp/Stage/Shelt.pxa similarity index 100% rename from build_jp/data/Stage/Shelt.pxa rename to assets/data_jp/Stage/Shelt.pxa diff --git a/build_jp/data/Stage/Shelt.pxe b/assets/data_jp/Stage/Shelt.pxe similarity index 100% rename from build_jp/data/Stage/Shelt.pxe rename to assets/data_jp/Stage/Shelt.pxe diff --git a/build_jp/data/Stage/Shelt.pxm b/assets/data_jp/Stage/Shelt.pxm similarity index 100% rename from build_jp/data/Stage/Shelt.pxm rename to assets/data_jp/Stage/Shelt.pxm diff --git a/build_jp/data/Stage/Shelt.tsc b/assets/data_jp/Stage/Shelt.tsc similarity index 100% rename from build_jp/data/Stage/Shelt.tsc rename to assets/data_jp/Stage/Shelt.tsc diff --git a/build_jp/data/Stage/Start.pxe b/assets/data_jp/Stage/Start.pxe similarity index 100% rename from build_jp/data/Stage/Start.pxe rename to assets/data_jp/Stage/Start.pxe diff --git a/build_jp/data/Stage/Start.pxm b/assets/data_jp/Stage/Start.pxm similarity index 100% rename from build_jp/data/Stage/Start.pxm rename to assets/data_jp/Stage/Start.pxm diff --git a/build_jp/data/Stage/Start.tsc b/assets/data_jp/Stage/Start.tsc similarity index 100% rename from build_jp/data/Stage/Start.tsc rename to assets/data_jp/Stage/Start.tsc diff --git a/build_jp/data/Stage/Statue.pxe b/assets/data_jp/Stage/Statue.pxe similarity index 100% rename from build_jp/data/Stage/Statue.pxe rename to assets/data_jp/Stage/Statue.pxe diff --git a/build_jp/data/Stage/Statue.pxm b/assets/data_jp/Stage/Statue.pxm similarity index 100% rename from build_jp/data/Stage/Statue.pxm rename to assets/data_jp/Stage/Statue.pxm diff --git a/build_jp/data/Stage/Statue.tsc b/assets/data_jp/Stage/Statue.tsc similarity index 100% rename from build_jp/data/Stage/Statue.tsc rename to assets/data_jp/Stage/Statue.tsc diff --git a/build_jp/data/Stage/Store.pxa b/assets/data_jp/Stage/Store.pxa similarity index 100% rename from build_jp/data/Stage/Store.pxa rename to assets/data_jp/Stage/Store.pxa diff --git a/build_jp/data/Stage/Stream.pxe b/assets/data_jp/Stage/Stream.pxe similarity index 100% rename from build_jp/data/Stage/Stream.pxe rename to assets/data_jp/Stage/Stream.pxe diff --git a/build_jp/data/Stage/Stream.pxm b/assets/data_jp/Stage/Stream.pxm similarity index 100% rename from build_jp/data/Stage/Stream.pxm rename to assets/data_jp/Stage/Stream.pxm diff --git a/build_jp/data/Stage/Stream.tsc b/assets/data_jp/Stage/Stream.tsc similarity index 100% rename from build_jp/data/Stage/Stream.tsc rename to assets/data_jp/Stage/Stream.tsc diff --git a/build_jp/data/Stage/Weed.pxa b/assets/data_jp/Stage/Weed.pxa similarity index 100% rename from build_jp/data/Stage/Weed.pxa rename to assets/data_jp/Stage/Weed.pxa diff --git a/build_jp/data/Stage/Weed.pxe b/assets/data_jp/Stage/Weed.pxe similarity index 100% rename from build_jp/data/Stage/Weed.pxe rename to assets/data_jp/Stage/Weed.pxe diff --git a/build_jp/data/Stage/Weed.pxm b/assets/data_jp/Stage/Weed.pxm similarity index 100% rename from build_jp/data/Stage/Weed.pxm rename to assets/data_jp/Stage/Weed.pxm diff --git a/build_jp/data/Stage/Weed.tsc b/assets/data_jp/Stage/Weed.tsc similarity index 100% rename from build_jp/data/Stage/Weed.tsc rename to assets/data_jp/Stage/Weed.tsc diff --git a/build_jp/data/Stage/WeedB.pxe b/assets/data_jp/Stage/WeedB.pxe similarity index 100% rename from build_jp/data/Stage/WeedB.pxe rename to assets/data_jp/Stage/WeedB.pxe diff --git a/build_jp/data/Stage/WeedB.pxm b/assets/data_jp/Stage/WeedB.pxm similarity index 100% rename from build_jp/data/Stage/WeedB.pxm rename to assets/data_jp/Stage/WeedB.pxm diff --git a/build_jp/data/Stage/WeedB.tsc b/assets/data_jp/Stage/WeedB.tsc similarity index 100% rename from build_jp/data/Stage/WeedB.tsc rename to assets/data_jp/Stage/WeedB.tsc diff --git a/build_jp/data/Stage/WeedD.pxe b/assets/data_jp/Stage/WeedD.pxe similarity index 100% rename from build_jp/data/Stage/WeedD.pxe rename to assets/data_jp/Stage/WeedD.pxe diff --git a/build_jp/data/Stage/WeedD.pxm b/assets/data_jp/Stage/WeedD.pxm similarity index 100% rename from build_jp/data/Stage/WeedD.pxm rename to assets/data_jp/Stage/WeedD.pxm diff --git a/build_jp/data/Stage/WeedD.tsc b/assets/data_jp/Stage/WeedD.tsc similarity index 100% rename from build_jp/data/Stage/WeedD.tsc rename to assets/data_jp/Stage/WeedD.tsc diff --git a/build_jp/data/Stage/WeedS.pxe b/assets/data_jp/Stage/WeedS.pxe similarity index 100% rename from build_jp/data/Stage/WeedS.pxe rename to assets/data_jp/Stage/WeedS.pxe diff --git a/build_jp/data/Stage/WeedS.pxm b/assets/data_jp/Stage/WeedS.pxm similarity index 100% rename from build_jp/data/Stage/WeedS.pxm rename to assets/data_jp/Stage/WeedS.pxm diff --git a/build_jp/data/Stage/WeedS.tsc b/assets/data_jp/Stage/WeedS.tsc similarity index 100% rename from build_jp/data/Stage/WeedS.tsc rename to assets/data_jp/Stage/WeedS.tsc diff --git a/build_jp/data/Stage/White.pxa b/assets/data_jp/Stage/White.pxa similarity index 100% rename from build_jp/data/Stage/White.pxa rename to assets/data_jp/Stage/White.pxa diff --git a/build_jp/data/Stage/e_Blcn.pxe b/assets/data_jp/Stage/e_Blcn.pxe similarity index 100% rename from build_jp/data/Stage/e_Blcn.pxe rename to assets/data_jp/Stage/e_Blcn.pxe diff --git a/build_jp/data/Stage/e_Blcn.pxm b/assets/data_jp/Stage/e_Blcn.pxm similarity index 100% rename from build_jp/data/Stage/e_Blcn.pxm rename to assets/data_jp/Stage/e_Blcn.pxm diff --git a/build_jp/data/Stage/e_Blcn.tsc b/assets/data_jp/Stage/e_Blcn.tsc similarity index 100% rename from build_jp/data/Stage/e_Blcn.tsc rename to assets/data_jp/Stage/e_Blcn.tsc diff --git a/build_jp/data/Stage/e_Ceme.pxe b/assets/data_jp/Stage/e_Ceme.pxe similarity index 100% rename from build_jp/data/Stage/e_Ceme.pxe rename to assets/data_jp/Stage/e_Ceme.pxe diff --git a/build_jp/data/Stage/e_Ceme.pxm b/assets/data_jp/Stage/e_Ceme.pxm similarity index 100% rename from build_jp/data/Stage/e_Ceme.pxm rename to assets/data_jp/Stage/e_Ceme.pxm diff --git a/build_jp/data/Stage/e_Ceme.tsc b/assets/data_jp/Stage/e_Ceme.tsc similarity index 100% rename from build_jp/data/Stage/e_Ceme.tsc rename to assets/data_jp/Stage/e_Ceme.tsc diff --git a/build_jp/data/Stage/e_Jenk.pxe b/assets/data_jp/Stage/e_Jenk.pxe similarity index 100% rename from build_jp/data/Stage/e_Jenk.pxe rename to assets/data_jp/Stage/e_Jenk.pxe diff --git a/build_jp/data/Stage/e_Jenk.pxm b/assets/data_jp/Stage/e_Jenk.pxm similarity index 100% rename from build_jp/data/Stage/e_Jenk.pxm rename to assets/data_jp/Stage/e_Jenk.pxm diff --git a/build_jp/data/Stage/e_Jenk.tsc b/assets/data_jp/Stage/e_Jenk.tsc similarity index 100% rename from build_jp/data/Stage/e_Jenk.tsc rename to assets/data_jp/Stage/e_Jenk.tsc diff --git a/build_jp/data/Stage/e_Labo.pxe b/assets/data_jp/Stage/e_Labo.pxe similarity index 100% rename from build_jp/data/Stage/e_Labo.pxe rename to assets/data_jp/Stage/e_Labo.pxe diff --git a/build_jp/data/Stage/e_Labo.pxm b/assets/data_jp/Stage/e_Labo.pxm similarity index 100% rename from build_jp/data/Stage/e_Labo.pxm rename to assets/data_jp/Stage/e_Labo.pxm diff --git a/build_jp/data/Stage/e_Labo.tsc b/assets/data_jp/Stage/e_Labo.tsc similarity index 100% rename from build_jp/data/Stage/e_Labo.tsc rename to assets/data_jp/Stage/e_Labo.tsc diff --git a/build_jp/data/Stage/e_Malc.pxe b/assets/data_jp/Stage/e_Malc.pxe similarity index 100% rename from build_jp/data/Stage/e_Malc.pxe rename to assets/data_jp/Stage/e_Malc.pxe diff --git a/build_jp/data/Stage/e_Malc.pxm b/assets/data_jp/Stage/e_Malc.pxm similarity index 100% rename from build_jp/data/Stage/e_Malc.pxm rename to assets/data_jp/Stage/e_Malc.pxm diff --git a/build_jp/data/Stage/e_Malc.tsc b/assets/data_jp/Stage/e_Malc.tsc similarity index 100% rename from build_jp/data/Stage/e_Malc.tsc rename to assets/data_jp/Stage/e_Malc.tsc diff --git a/build_jp/data/Stage/e_Maze.pxe b/assets/data_jp/Stage/e_Maze.pxe similarity index 100% rename from build_jp/data/Stage/e_Maze.pxe rename to assets/data_jp/Stage/e_Maze.pxe diff --git a/build_jp/data/Stage/e_Maze.pxm b/assets/data_jp/Stage/e_Maze.pxm similarity index 100% rename from build_jp/data/Stage/e_Maze.pxm rename to assets/data_jp/Stage/e_Maze.pxm diff --git a/build_jp/data/Stage/e_Maze.tsc b/assets/data_jp/Stage/e_Maze.tsc similarity index 100% rename from build_jp/data/Stage/e_Maze.tsc rename to assets/data_jp/Stage/e_Maze.tsc diff --git a/build_jp/data/Stage/e_Sky.pxe b/assets/data_jp/Stage/e_Sky.pxe similarity index 100% rename from build_jp/data/Stage/e_Sky.pxe rename to assets/data_jp/Stage/e_Sky.pxe diff --git a/build_jp/data/Stage/e_Sky.pxm b/assets/data_jp/Stage/e_Sky.pxm similarity index 100% rename from build_jp/data/Stage/e_Sky.pxm rename to assets/data_jp/Stage/e_Sky.pxm diff --git a/build_jp/data/Stage/e_Sky.tsc b/assets/data_jp/Stage/e_Sky.tsc similarity index 100% rename from build_jp/data/Stage/e_Sky.tsc rename to assets/data_jp/Stage/e_Sky.tsc diff --git a/build_jp/data/StageImage.pbm b/assets/data_jp/StageImage.pbm similarity index 100% rename from build_jp/data/StageImage.pbm rename to assets/data_jp/StageImage.pbm diff --git a/build_jp/data/StageSelect.tsc b/assets/data_jp/StageSelect.tsc similarity index 100% rename from build_jp/data/StageSelect.tsc rename to assets/data_jp/StageSelect.tsc diff --git a/build_jp/data/TextBox.pbm b/assets/data_jp/TextBox.pbm similarity index 100% rename from build_jp/data/TextBox.pbm rename to assets/data_jp/TextBox.pbm diff --git a/build_jp/data/Title.pbm b/assets/data_jp/Title.pbm similarity index 100% rename from build_jp/data/Title.pbm rename to assets/data_jp/Title.pbm diff --git a/build_jp/data/bk0.pbm b/assets/data_jp/bk0.pbm similarity index 100% rename from build_jp/data/bk0.pbm rename to assets/data_jp/bk0.pbm diff --git a/build_jp/data/bkBlack.pbm b/assets/data_jp/bkBlack.pbm similarity index 100% rename from build_jp/data/bkBlack.pbm rename to assets/data_jp/bkBlack.pbm diff --git a/build_jp/data/bkBlue.pbm b/assets/data_jp/bkBlue.pbm similarity index 100% rename from build_jp/data/bkBlue.pbm rename to assets/data_jp/bkBlue.pbm diff --git a/build_jp/data/bkFall.pbm b/assets/data_jp/bkFall.pbm similarity index 100% rename from build_jp/data/bkFall.pbm rename to assets/data_jp/bkFall.pbm diff --git a/build_jp/data/bkFog.pbm b/assets/data_jp/bkFog.pbm similarity index 100% rename from build_jp/data/bkFog.pbm rename to assets/data_jp/bkFog.pbm diff --git a/build_jp/data/bkGard.pbm b/assets/data_jp/bkGard.pbm similarity index 100% rename from build_jp/data/bkGard.pbm rename to assets/data_jp/bkGard.pbm diff --git a/build_jp/data/bkGray.pbm b/assets/data_jp/bkGray.pbm similarity index 100% rename from build_jp/data/bkGray.pbm rename to assets/data_jp/bkGray.pbm diff --git a/build_jp/data/bkGreen.pbm b/assets/data_jp/bkGreen.pbm similarity index 100% rename from build_jp/data/bkGreen.pbm rename to assets/data_jp/bkGreen.pbm diff --git a/build_jp/data/bkMaze.pbm b/assets/data_jp/bkMaze.pbm similarity index 100% rename from build_jp/data/bkMaze.pbm rename to assets/data_jp/bkMaze.pbm diff --git a/build_jp/data/bkMoon.pbm b/assets/data_jp/bkMoon.pbm similarity index 100% rename from build_jp/data/bkMoon.pbm rename to assets/data_jp/bkMoon.pbm diff --git a/build_jp/data/bkRed.pbm b/assets/data_jp/bkRed.pbm similarity index 100% rename from build_jp/data/bkRed.pbm rename to assets/data_jp/bkRed.pbm diff --git a/build_jp/data/bkWater.pbm b/assets/data_jp/bkWater.pbm similarity index 100% rename from build_jp/data/bkWater.pbm rename to assets/data_jp/bkWater.pbm diff --git a/build_jp/data/casts.pbm b/assets/data_jp/casts.pbm similarity index 100% rename from build_jp/data/casts.pbm rename to assets/data_jp/casts.pbm diff --git a/build_jp/data/npc.tbl b/assets/data_jp/npc.tbl similarity index 100% rename from build_jp/data/npc.tbl rename to assets/data_jp/npc.tbl diff --git a/res/BITMAP/Credit01.bmp b/assets/resources/BITMAP/Credit01.bmp similarity index 100% rename from res/BITMAP/Credit01.bmp rename to assets/resources/BITMAP/Credit01.bmp diff --git a/res/BITMAP/Credit02.bmp b/assets/resources/BITMAP/Credit02.bmp similarity index 100% rename from res/BITMAP/Credit02.bmp rename to assets/resources/BITMAP/Credit02.bmp diff --git a/res/BITMAP/Credit03.bmp b/assets/resources/BITMAP/Credit03.bmp similarity index 100% rename from res/BITMAP/Credit03.bmp rename to assets/resources/BITMAP/Credit03.bmp diff --git a/res/BITMAP/Credit04.bmp b/assets/resources/BITMAP/Credit04.bmp similarity index 100% rename from res/BITMAP/Credit04.bmp rename to assets/resources/BITMAP/Credit04.bmp diff --git a/res/BITMAP/Credit05.bmp b/assets/resources/BITMAP/Credit05.bmp similarity index 100% rename from res/BITMAP/Credit05.bmp rename to assets/resources/BITMAP/Credit05.bmp diff --git a/res/BITMAP/Credit06.bmp b/assets/resources/BITMAP/Credit06.bmp similarity index 100% rename from res/BITMAP/Credit06.bmp rename to assets/resources/BITMAP/Credit06.bmp diff --git a/res/BITMAP/Credit07.bmp b/assets/resources/BITMAP/Credit07.bmp similarity index 100% rename from res/BITMAP/Credit07.bmp rename to assets/resources/BITMAP/Credit07.bmp diff --git a/res/BITMAP/Credit08.bmp b/assets/resources/BITMAP/Credit08.bmp similarity index 100% rename from res/BITMAP/Credit08.bmp rename to assets/resources/BITMAP/Credit08.bmp diff --git a/res/BITMAP/Credit09.bmp b/assets/resources/BITMAP/Credit09.bmp similarity index 100% rename from res/BITMAP/Credit09.bmp rename to assets/resources/BITMAP/Credit09.bmp diff --git a/res/BITMAP/Credit10.bmp b/assets/resources/BITMAP/Credit10.bmp similarity index 100% rename from res/BITMAP/Credit10.bmp rename to assets/resources/BITMAP/Credit10.bmp diff --git a/res/BITMAP/Credit11.bmp b/assets/resources/BITMAP/Credit11.bmp similarity index 100% rename from res/BITMAP/Credit11.bmp rename to assets/resources/BITMAP/Credit11.bmp diff --git a/res/BITMAP/Credit12.bmp b/assets/resources/BITMAP/Credit12.bmp similarity index 100% rename from res/BITMAP/Credit12.bmp rename to assets/resources/BITMAP/Credit12.bmp diff --git a/res/BITMAP/Credit14.bmp b/assets/resources/BITMAP/Credit14.bmp similarity index 100% rename from res/BITMAP/Credit14.bmp rename to assets/resources/BITMAP/Credit14.bmp diff --git a/res/BITMAP/Credit15.bmp b/assets/resources/BITMAP/Credit15.bmp similarity index 100% rename from res/BITMAP/Credit15.bmp rename to assets/resources/BITMAP/Credit15.bmp diff --git a/res/BITMAP/Credit16.bmp b/assets/resources/BITMAP/Credit16.bmp similarity index 100% rename from res/BITMAP/Credit16.bmp rename to assets/resources/BITMAP/Credit16.bmp diff --git a/res/BITMAP/Credit17.bmp b/assets/resources/BITMAP/Credit17.bmp similarity index 100% rename from res/BITMAP/Credit17.bmp rename to assets/resources/BITMAP/Credit17.bmp diff --git a/res/BITMAP/Credit18.bmp b/assets/resources/BITMAP/Credit18.bmp similarity index 100% rename from res/BITMAP/Credit18.bmp rename to assets/resources/BITMAP/Credit18.bmp diff --git a/res/BITMAP/pixel.bmp b/assets/resources/BITMAP/pixel.bmp similarity index 100% rename from res/BITMAP/pixel.bmp rename to assets/resources/BITMAP/pixel.bmp diff --git a/res/BITMAP/pixel_jp.bmp b/assets/resources/BITMAP/pixel_jp.bmp similarity index 100% rename from res/BITMAP/pixel_jp.bmp rename to assets/resources/BITMAP/pixel_jp.bmp diff --git a/res/CURSOR/CURSOR_IKA.bmp b/assets/resources/CURSOR/CURSOR_IKA.bmp similarity index 100% rename from res/CURSOR/CURSOR_IKA.bmp rename to assets/resources/CURSOR/CURSOR_IKA.bmp diff --git a/res/CURSOR/CURSOR_NORMAL.bmp b/assets/resources/CURSOR/CURSOR_NORMAL.bmp similarity index 100% rename from res/CURSOR/CURSOR_NORMAL.bmp rename to assets/resources/CURSOR/CURSOR_NORMAL.bmp diff --git a/res/FONT/cour.ttf b/assets/resources/FONT/cour.ttf similarity index 100% rename from res/FONT/cour.ttf rename to assets/resources/FONT/cour.ttf diff --git a/res/FONT/msgothic.ttc b/assets/resources/FONT/msgothic.ttc similarity index 100% rename from res/FONT/msgothic.ttc rename to assets/resources/FONT/msgothic.ttc diff --git a/res/ICON/0.ico b/assets/resources/ICON/0.ico similarity index 100% rename from res/ICON/0.ico rename to assets/resources/ICON/0.ico diff --git a/res/ICON/ICON.rc b/assets/resources/ICON/ICON.rc similarity index 100% rename from res/ICON/ICON.rc rename to assets/resources/ICON/ICON.rc diff --git a/res/ICON/ICON_MINI.bmp b/assets/resources/ICON/ICON_MINI.bmp similarity index 100% rename from res/ICON/ICON_MINI.bmp rename to assets/resources/ICON/ICON_MINI.bmp diff --git a/res/ICON/ICON_MINI.ico b/assets/resources/ICON/ICON_MINI.ico similarity index 100% rename from res/ICON/ICON_MINI.ico rename to assets/resources/ICON/ICON_MINI.ico diff --git a/res/ORG/Access.org b/assets/resources/ORG/Access.org similarity index 100% rename from res/ORG/Access.org rename to assets/resources/ORG/Access.org diff --git a/res/ORG/Anzen.org b/assets/resources/ORG/Anzen.org similarity index 100% rename from res/ORG/Anzen.org rename to assets/resources/ORG/Anzen.org diff --git a/res/ORG/Balcony.org b/assets/resources/ORG/Balcony.org similarity index 100% rename from res/ORG/Balcony.org rename to assets/resources/ORG/Balcony.org diff --git a/res/ORG/Ballos.org b/assets/resources/ORG/Ballos.org similarity index 100% rename from res/ORG/Ballos.org rename to assets/resources/ORG/Ballos.org diff --git a/res/ORG/BreakDown.org b/assets/resources/ORG/BreakDown.org similarity index 100% rename from res/ORG/BreakDown.org rename to assets/resources/ORG/BreakDown.org diff --git a/res/ORG/Cemetery.org b/assets/resources/ORG/Cemetery.org similarity index 100% rename from res/ORG/Cemetery.org rename to assets/resources/ORG/Cemetery.org diff --git a/res/ORG/Curly.org b/assets/resources/ORG/Curly.org similarity index 100% rename from res/ORG/Curly.org rename to assets/resources/ORG/Curly.org diff --git a/res/ORG/Dr.org b/assets/resources/ORG/Dr.org similarity index 100% rename from res/ORG/Dr.org rename to assets/resources/ORG/Dr.org diff --git a/res/ORG/Ending.org b/assets/resources/ORG/Ending.org similarity index 100% rename from res/ORG/Ending.org rename to assets/resources/ORG/Ending.org diff --git a/res/ORG/Escape.org b/assets/resources/ORG/Escape.org similarity index 100% rename from res/ORG/Escape.org rename to assets/resources/ORG/Escape.org diff --git a/res/ORG/Fanfale1.org b/assets/resources/ORG/Fanfale1.org similarity index 100% rename from res/ORG/Fanfale1.org rename to assets/resources/ORG/Fanfale1.org diff --git a/res/ORG/Fanfale2.org b/assets/resources/ORG/Fanfale2.org similarity index 100% rename from res/ORG/Fanfale2.org rename to assets/resources/ORG/Fanfale2.org diff --git a/res/ORG/Fanfale3.org b/assets/resources/ORG/Fanfale3.org similarity index 100% rename from res/ORG/Fanfale3.org rename to assets/resources/ORG/Fanfale3.org diff --git a/res/ORG/FireEye.org b/assets/resources/ORG/FireEye.org similarity index 100% rename from res/ORG/FireEye.org rename to assets/resources/ORG/FireEye.org diff --git a/res/ORG/Gameover.org b/assets/resources/ORG/Gameover.org similarity index 100% rename from res/ORG/Gameover.org rename to assets/resources/ORG/Gameover.org diff --git a/res/ORG/Ginsuke.org b/assets/resources/ORG/Ginsuke.org similarity index 100% rename from res/ORG/Ginsuke.org rename to assets/resources/ORG/Ginsuke.org diff --git a/res/ORG/Grand.org b/assets/resources/ORG/Grand.org similarity index 100% rename from res/ORG/Grand.org rename to assets/resources/ORG/Grand.org diff --git a/res/ORG/Gravity.org b/assets/resources/ORG/Gravity.org similarity index 100% rename from res/ORG/Gravity.org rename to assets/resources/ORG/Gravity.org diff --git a/res/ORG/Hell.org b/assets/resources/ORG/Hell.org similarity index 100% rename from res/ORG/Hell.org rename to assets/resources/ORG/Hell.org diff --git a/res/ORG/Jenka.org b/assets/resources/ORG/Jenka.org similarity index 100% rename from res/ORG/Jenka.org rename to assets/resources/ORG/Jenka.org diff --git a/res/ORG/Jenka2.org b/assets/resources/ORG/Jenka2.org similarity index 100% rename from res/ORG/Jenka2.org rename to assets/resources/ORG/Jenka2.org diff --git a/res/ORG/Kodou.org b/assets/resources/ORG/Kodou.org similarity index 100% rename from res/ORG/Kodou.org rename to assets/resources/ORG/Kodou.org diff --git a/res/ORG/LastBtl.org b/assets/resources/ORG/LastBtl.org similarity index 100% rename from res/ORG/LastBtl.org rename to assets/resources/ORG/LastBtl.org diff --git a/res/ORG/LastBtl3.org b/assets/resources/ORG/LastBtl3.org similarity index 100% rename from res/ORG/LastBtl3.org rename to assets/resources/ORG/LastBtl3.org diff --git a/res/ORG/LastCave.org b/assets/resources/ORG/LastCave.org similarity index 100% rename from res/ORG/LastCave.org rename to assets/resources/ORG/LastCave.org diff --git a/res/ORG/MDown2.org b/assets/resources/ORG/MDown2.org similarity index 100% rename from res/ORG/MDown2.org rename to assets/resources/ORG/MDown2.org diff --git a/res/ORG/Marine.org b/assets/resources/ORG/Marine.org similarity index 100% rename from res/ORG/Marine.org rename to assets/resources/ORG/Marine.org diff --git a/res/ORG/Maze.org b/assets/resources/ORG/Maze.org similarity index 100% rename from res/ORG/Maze.org rename to assets/resources/ORG/Maze.org diff --git a/res/ORG/Mura.org b/assets/resources/ORG/Mura.org similarity index 100% rename from res/ORG/Mura.org rename to assets/resources/ORG/Mura.org diff --git a/res/ORG/Oside.org b/assets/resources/ORG/Oside.org similarity index 100% rename from res/ORG/Oside.org rename to assets/resources/ORG/Oside.org diff --git a/res/ORG/Plant.org b/assets/resources/ORG/Plant.org similarity index 100% rename from res/ORG/Plant.org rename to assets/resources/ORG/Plant.org diff --git a/res/ORG/Requiem.org b/assets/resources/ORG/Requiem.org similarity index 100% rename from res/ORG/Requiem.org rename to assets/resources/ORG/Requiem.org diff --git a/res/ORG/Toroko.org b/assets/resources/ORG/Toroko.org similarity index 100% rename from res/ORG/Toroko.org rename to assets/resources/ORG/Toroko.org diff --git a/res/ORG/Vivi.org b/assets/resources/ORG/Vivi.org similarity index 100% rename from res/ORG/Vivi.org rename to assets/resources/ORG/Vivi.org diff --git a/res/ORG/Wanpak2.org b/assets/resources/ORG/Wanpak2.org similarity index 100% rename from res/ORG/Wanpak2.org rename to assets/resources/ORG/Wanpak2.org diff --git a/res/ORG/Wanpaku.org b/assets/resources/ORG/Wanpaku.org similarity index 100% rename from res/ORG/Wanpaku.org rename to assets/resources/ORG/Wanpaku.org diff --git a/res/ORG/Weed.org b/assets/resources/ORG/Weed.org similarity index 100% rename from res/ORG/Weed.org rename to assets/resources/ORG/Weed.org diff --git a/res/ORG/White.org b/assets/resources/ORG/White.org similarity index 100% rename from res/ORG/White.org rename to assets/resources/ORG/White.org diff --git a/res/ORG/XXXX.org b/assets/resources/ORG/XXXX.org similarity index 100% rename from res/ORG/XXXX.org rename to assets/resources/ORG/XXXX.org diff --git a/res/ORG/Zonbie.org b/assets/resources/ORG/Zonbie.org similarity index 100% rename from res/ORG/Zonbie.org rename to assets/resources/ORG/Zonbie.org diff --git a/res/ORG/ironH.org b/assets/resources/ORG/ironH.org similarity index 100% rename from res/ORG/ironH.org rename to assets/resources/ORG/ironH.org diff --git a/res/ORG/quiet.org b/assets/resources/ORG/quiet.org similarity index 100% rename from res/ORG/quiet.org rename to assets/resources/ORG/quiet.org diff --git a/res/WAVE/Wave.dat b/assets/resources/WAVE/Wave.dat similarity index 100% rename from res/WAVE/Wave.dat rename to assets/resources/WAVE/Wave.dat diff --git a/bin2h/CMakeLists.txt b/bin2h/CMakeLists.txt index f2b1ce9d..bca86b88 100644 --- a/bin2h/CMakeLists.txt +++ b/bin2h/CMakeLists.txt @@ -29,3 +29,5 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") endif() endif() endif() + +install(TARGETS bin2h RUNTIME DESTINATION bin) diff --git a/msvc2003/CSE2.vcproj b/msvc2003/CSE2.vcproj index 4832e8f1..fb57cc27 100644 --- a/msvc2003/CSE2.vcproj +++ b/msvc2003/CSE2.vcproj @@ -633,7 +633,7 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + RelativePath="..\assets\resources\Icon\ICON.rc"> diff --git a/src/Back.cpp b/src/Back.cpp index 7bdcc960..71832cf4 100644 --- a/src/Back.cpp +++ b/src/Back.cpp @@ -1,9 +1,11 @@ #include "Back.h" +#include #include #include "WindowsWrapper.h" +#include "CommonDefines.h" #include "Draw.h" #include "File.h" #include "Frame.h" diff --git a/src/BossIronH.cpp b/src/BossIronH.cpp index c76ec3c0..6ad2f238 100644 --- a/src/BossIronH.cpp +++ b/src/BossIronH.cpp @@ -6,6 +6,7 @@ #include "Frame.h" #include "Game.h" #include "MyChar.h" +#include "NpChar.h" #include "Sound.h" void ActBossChar_Ironhead(void) diff --git a/src/BossPress.cpp b/src/BossPress.cpp index 5412b46e..f9b62b6c 100644 --- a/src/BossPress.cpp +++ b/src/BossPress.cpp @@ -5,6 +5,7 @@ #include "Boss.h" #include "Game.h" #include "Map.h" +#include "NpChar.h" #include "Sound.h" void ActBossChar_Press(void) diff --git a/src/BulHit.cpp b/src/BulHit.cpp index df8330a2..91db2033 100644 --- a/src/BulHit.cpp +++ b/src/BulHit.cpp @@ -1,13 +1,9 @@ #include "BulHit.h" -#include -#include - #include "Bullet.h" #include "Caret.h" #include "Game.h" #include "Map.h" -#include "MyChar.h" #include "NpChar.h" #include "Sound.h" diff --git a/src/Bullet.h b/src/Bullet.h index 5e08a593..070b4565 100644 --- a/src/Bullet.h +++ b/src/Bullet.h @@ -29,7 +29,13 @@ struct BULLET int enemyYL; int blockXL; int blockYL; - RECT view; + struct + { + int front; + int top; + int back; + int bottom; + } view; }; struct BULLET_TABLE @@ -42,7 +48,13 @@ struct BULLET_TABLE int enemyYL; int blockXL; int blockYL; - RECT view; + struct + { + int front; + int top; + int back; + int bottom; + } view; }; #define BULLET_MAX 0x40 diff --git a/src/Config.cpp b/src/Config.cpp index 909948e3..732466be 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -8,7 +8,6 @@ #include "Config.h" #include "File.h" #include "Tags.h" -#include "Types.h" static const char* const config_filename = "Config.dat"; // Not the original name static const char* const config_magic = "DOUKUTSU20041206"; // Not the original name diff --git a/src/Draw.cpp b/src/Draw.cpp index 58ec6af3..602b71fb 100644 --- a/src/Draw.cpp +++ b/src/Draw.cpp @@ -5,18 +5,6 @@ #endif #include -#ifdef WINDOWS -#define RECT WINRECT -#define FindResource WinFindResource // All these damn name collisions... -#define DrawText WinDrawText -#define LoadFont WinLoadFont -#include -#undef LoadFont -#undef DrawText -#undef FindResource -#undef RECT -#endif - #include "SDL.h" #include "WindowsWrapper.h" @@ -26,7 +14,6 @@ #include "Font.h" #include "Resource.h" #include "Tags.h" -#include "Types.h" struct SURFACE { @@ -51,7 +38,7 @@ FontObject *gFont; #define FRAMERATE 20 -BOOL Flip_SystemTask(int hWnd) +BOOL Flip_SystemTask(HWND hWnd) { (void)hWnd; diff --git a/src/Draw.h b/src/Draw.h index 0ee159e7..cfef72b7 100644 --- a/src/Draw.h +++ b/src/Draw.h @@ -52,7 +52,7 @@ struct SURFACE; extern SURFACE surf[SURFACE_ID_MAX]; -BOOL Flip_SystemTask(int hWnd); +BOOL Flip_SystemTask(HWND hWnd); BOOL StartDirectDraw(int lMagnification, int lColourDepth); void EndDirectDraw(); void ReleaseSurface(int s); diff --git a/src/Ending.cpp b/src/Ending.cpp index 3ab2cefd..635bf66c 100644 --- a/src/Ending.cpp +++ b/src/Ending.cpp @@ -434,7 +434,7 @@ void CutCreditIllust() } // Scene of the island falling -int Scene_DownIsland(int hWnd, int mode) +int Scene_DownIsland(HWND hWnd, int mode) { // Setup background RECT rc_frame = {(WINDOW_WIDTH - 160) / 2, (WINDOW_HEIGHT - 80) / 2, (WINDOW_WIDTH + 160) / 2, (WINDOW_HEIGHT + 80) / 2}; diff --git a/src/Ending.h b/src/Ending.h index 4a745ce4..cbbcc1e7 100644 --- a/src/Ending.h +++ b/src/Ending.h @@ -2,6 +2,8 @@ #include "WindowsWrapper.h" +#include "CommonDefines.h" + struct CREDIT { int size; @@ -48,4 +50,4 @@ BOOL StartCreditScript(); void ActionCredit(); void SetCreditIllust(int a); void CutCreditIllust(); -int Scene_DownIsland(int hWnd, int mode); +int Scene_DownIsland(HWND hWnd, int mode); diff --git a/src/Escape.cpp b/src/Escape.cpp index bd7c80d3..fb8cba56 100644 --- a/src/Escape.cpp +++ b/src/Escape.cpp @@ -7,7 +7,7 @@ #include "KeyControl.h" #include "Main.h" -int Call_Escape(int hWnd) +int Call_Escape(HWND hWnd) { RECT rc = {0, 128, 208, 144}; diff --git a/src/Escape.h b/src/Escape.h index d63213c1..508da8c9 100644 --- a/src/Escape.h +++ b/src/Escape.h @@ -1,3 +1,5 @@ #pragma once -int Call_Escape(int hWnd); +#include "WindowsWrapper.h" + +int Call_Escape(HWND hWnd); diff --git a/src/Fade.cpp b/src/Fade.cpp index 403a4e0e..9c5986bc 100644 --- a/src/Fade.cpp +++ b/src/Fade.cpp @@ -6,7 +6,6 @@ #include "WindowsWrapper.h" #include "Draw.h" -#include "Game.h" #define FADE_WIDTH (((WINDOW_WIDTH - 1) / 16) + 1) #define FADE_HEIGHT (((WINDOW_HEIGHT - 1) / 16) + 1) diff --git a/src/Font.cpp b/src/Font.cpp index b4f3da70..4ce46010 100644 --- a/src/Font.cpp +++ b/src/Font.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include diff --git a/src/Frame.cpp b/src/Frame.cpp index eb1d71af..be669d89 100644 --- a/src/Frame.cpp +++ b/src/Frame.cpp @@ -1,7 +1,5 @@ #include "Frame.h" -#include - #include "Boss.h" #include "CommonDefines.h" #include "Game.h" diff --git a/src/Game.cpp b/src/Game.cpp index cca03ae1..ddbcf50c 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -1,8 +1,7 @@ #include "Game.h" -#include +#include #include -#include #include @@ -15,6 +14,7 @@ #include "BulHit.h" #include "Bullet.h" #include "Caret.h" +#include "CommonDefines.h" #include "Draw.h" #include "Ending.h" #include "Escape.h" @@ -35,7 +35,6 @@ #include "NpChar.h" #include "NpcHit.h" #include "NpcTbl.h" -#include "Organya.h" #include "Profile.h" #include "SelStage.h" #include "Shoot.h" @@ -141,11 +140,13 @@ int ModeOpening() // Escape menu if (gKey & KEY_ESCAPE) { - int escRet = Call_Escape(ghWnd); - if (escRet == 0) - return 0; - if (escRet == 2) - return 1; + switch (Call_Escape(ghWnd)) + { + case 0: + return 0; + case 2: + return 1; + } } // Skip intro if OK is pressed @@ -183,11 +184,13 @@ int ModeOpening() PutFade(); // Update Text Script - int tscRet = TextScriptProc(); - if (tscRet == 0) - return 0; - if (tscRet == 2) - return 1; + switch (TextScriptProc()) + { + case 0: + return 0; + case 2: + return 1; + } PutMapName(FALSE); PutTextScript(); @@ -335,11 +338,13 @@ int ModeTitle() if (gKey & KEY_ESCAPE) { - int escRet = Call_Escape(ghWnd); - if (escRet == 0) - return 0; - if (escRet == 2) - return 1; + switch (Call_Escape(ghWnd)) + { + case 0: + return 0; + case 2: + return 1; + } } // Move cursor @@ -469,7 +474,7 @@ int ModeAction() InitFlags(); InitBossLife(); - if ((bContinue && LoadProfile(NULL)) || InitializeGame()) + if ((bContinue && LoadProfile(NULL)) || InitializeGame(ghWnd)) { while (1) { @@ -479,11 +484,13 @@ int ModeAction() // Escape menu if (gKey & KEY_ESCAPE) { - int escRet = Call_Escape(ghWnd); - if (escRet == 0) - return 0; - if (escRet == 2) - return 1; + switch (Call_Escape(ghWnd)) + { + case 0: + return 0; + case 2: + return 1; + } } if (swPlay % 2 && g_GameFlags & 1) @@ -587,11 +594,13 @@ int ModeAction() if (swPlay % 2) { - int tscRet = TextScriptProc(); - if (tscRet == 0) - return 0; - if (tscRet == 2) - return 1; + switch (TextScriptProc()) + { + case 0: + return 0; + case 2: + return 1; + } } PutMapName(FALSE); diff --git a/src/Input.cpp b/src/Input.cpp index af9fb9af..a26e4ef0 100644 --- a/src/Input.cpp +++ b/src/Input.cpp @@ -3,14 +3,10 @@ #include #include -#include +#include "SDL.h" #include "WindowsWrapper.h" -#include "CommonDefines.h" -#include "Tags.h" -#include "Types.h" - #define JOYSTICK_DEADZONE 10000 SDL_Joystick *joystick; // This was probably a name that was given by Simon, but it fits the rest of Pixel's names so it's fine. diff --git a/src/Main.cpp b/src/Main.cpp index ba1f6f58..6e41ec36 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include "SDL.h" #include "WindowsWrapper.h" @@ -21,7 +21,6 @@ #include "Resource.h" #include "Sound.h" #include "Triangle.h" -#include "Types.h" // These two are defined in Draw.cpp. This is a bit of a hack. extern SDL_Window *gWindow; @@ -32,7 +31,7 @@ char gDataPath[PATH_LENGTH]; int gJoystickButtonTable[8]; -int ghWnd; // Placeholder until we restore the WinAPI code +HWND ghWnd; // Placeholder until we restore the WinAPI code BOOL gbUseJoystick = FALSE; BOOL bFps = FALSE; diff --git a/src/Main.h b/src/Main.h index 4213ccfe..51172956 100644 --- a/src/Main.h +++ b/src/Main.h @@ -1,6 +1,8 @@ #pragma once -extern int ghWnd; +#include "WindowsWrapper.h" + +extern HWND ghWnd; void PutFramePerSecound(); int GetFramePerSecound(); diff --git a/src/Map.cpp b/src/Map.cpp index 94bec202..25decba2 100644 --- a/src/Map.cpp +++ b/src/Map.cpp @@ -1,6 +1,7 @@ #include "Map.h" #include +#include #include #include diff --git a/src/MiniMap.cpp b/src/MiniMap.cpp index f444580b..ce3f4ea1 100644 --- a/src/MiniMap.cpp +++ b/src/MiniMap.cpp @@ -7,7 +7,6 @@ #include "CommonDefines.h" #include "Draw.h" #include "Escape.h" -#include "Game.h" #include "KeyControl.h" #include "Main.h" #include "Map.h" diff --git a/src/MyChar.cpp b/src/MyChar.cpp index ab7e18c8..c4551183 100644 --- a/src/MyChar.cpp +++ b/src/MyChar.cpp @@ -201,14 +201,14 @@ void PutMyChar(int fx, int fy) if (gMC.direct == 0) PutBitmap3( &grcGame, - (gMC.x - gMC.view.left) / 0x200 - fx / 0x200 - 8, + (gMC.x - gMC.view.front) / 0x200 - fx / 0x200 - 8, (gMC.y - gMC.view.top) / 0x200 - fy / 0x200 + arms_offset_y, &gMC.rect_arms, SURFACE_ID_ARMS); else PutBitmap3( &grcGame, - (gMC.x - gMC.view.left) / 0x200 - fx / 0x200, + (gMC.x - gMC.view.front) / 0x200 - fx / 0x200, (gMC.y - gMC.view.top) / 0x200 - fy / 0x200 + arms_offset_y, &gMC.rect_arms, SURFACE_ID_ARMS); @@ -224,7 +224,7 @@ void PutMyChar(int fx, int fy) rect.bottom += 32; } - PutBitmap3(&grcGame, (gMC.x - gMC.view.left) / 0x200 - fx / 0x200, (gMC.y - gMC.view.top) / 0x200 - fy / 0x200, &rect, SURFACE_ID_MY_CHAR); + PutBitmap3(&grcGame, (gMC.x - gMC.view.front) / 0x200 - fx / 0x200, (gMC.y - gMC.view.top) / 0x200 - fy / 0x200, &rect, SURFACE_ID_MY_CHAR); // Draw air tank RECT rcBubble[2] = { diff --git a/src/MyChar.h b/src/MyChar.h index 797a6e92..fb034341 100644 --- a/src/MyChar.h +++ b/src/MyChar.h @@ -21,8 +21,20 @@ struct MYCHAR int ym; int ani_wait; int ani_no; - RECT hit; - RECT view; + struct + { + int front; + int top; + int back; + int bottom; + } hit; + struct + { + int front; + int top; + int back; + int bottom; + } view; RECT rect; RECT rect_arms; int level; diff --git a/src/MycHit.cpp b/src/MycHit.cpp index 3e52aa7a..e0aa7209 100644 --- a/src/MycHit.cpp +++ b/src/MycHit.cpp @@ -36,11 +36,11 @@ int JudgeHitMyCharBlock(int x, int y) // Left wall if (gMC.y - gMC.hit.top < (y * 0x10 + 4) * 0x200 && gMC.y + gMC.hit.bottom > (y * 0x10 - 4) * 0x200 - && gMC.x - gMC.hit.left < (x * 0x10 + 8) * 0x200 - && gMC.x - gMC.hit.left > x * 0x10 * 0x200) + && gMC.x - gMC.hit.back < (x * 0x10 + 8) * 0x200 + && gMC.x - gMC.hit.back > x * 0x10 * 0x200) { // Clip - gMC.x = ((x * 0x10 + 8) * 0x200) + gMC.hit.left; + gMC.x = ((x * 0x10 + 8) * 0x200) + gMC.hit.back; // Halt momentum if (gMC.xm < -0x180) @@ -55,11 +55,11 @@ int JudgeHitMyCharBlock(int x, int y) // Right wall if (gMC.y - gMC.hit.top < (y * 0x10 + 4) * 0x200 && gMC.y + gMC.hit.bottom > (y * 0x10 - 4) * 0x200 - && gMC.x + gMC.hit.right > (x * 0x10 - 8) * 0x200 - && gMC.x + gMC.hit.left < x * 0x10 * 0x200) + && gMC.x + gMC.hit.back > (x * 0x10 - 8) * 0x200 + && gMC.x + gMC.hit.back < x * 0x10 * 0x200) { // Clip - gMC.x = ((x * 0x10 - 8) * 0x200) - gMC.hit.right; + gMC.x = ((x * 0x10 - 8) * 0x200) - gMC.hit.back; // Halt momentum if (gMC.xm > 0x180) @@ -72,8 +72,8 @@ int JudgeHitMyCharBlock(int x, int y) } // Ceiling - if (gMC.x - gMC.hit.right < (x * 0x10 + 5) * 0x200 - && gMC.x + gMC.hit.right > (x * 0x10 - 5) * 0x200 + if (gMC.x - gMC.hit.back < (x * 0x10 + 5) * 0x200 + && gMC.x + gMC.hit.back > (x * 0x10 - 5) * 0x200 && gMC.y - gMC.hit.top < (y * 0x10 + 8) * 0x200 && gMC.y - gMC.hit.top > y * 0x10 * 0x200) { @@ -91,8 +91,8 @@ int JudgeHitMyCharBlock(int x, int y) } // Floor - if (gMC.x - gMC.hit.right < (x * 0x10 + 5) * 0x200 - && gMC.x + gMC.hit.right > ((x * 0x10 - 5) * 0x200) + if (gMC.x - gMC.hit.back < (x * 0x10 + 5) * 0x200 + && gMC.x + gMC.hit.back > ((x * 0x10 - 5) * 0x200) && gMC.y + gMC.hit.bottom > (y * 0x10 - 8) * 0x200 && gMC.y + gMC.hit.bottom < y * 0x10 * 0x200) { @@ -324,8 +324,8 @@ int JudgeHitMyCharWater(int x, int y) { int hit = 0; - if (gMC.x - gMC.hit.right < (x * 0x10 + 5) * 0x200 - && gMC.x + gMC.hit.right > ((x * 0x10 - 5) * 0x200) + if (gMC.x - gMC.hit.back < (x * 0x10 + 5) * 0x200 + && gMC.x + gMC.hit.back > ((x * 0x10 - 5) * 0x200) && gMC.y - gMC.hit.top < ((y * 0x10 + 5) * 0x200) && gMC.y + gMC.hit.bottom > y * 0x10 * 0x200) hit |= 0x100; @@ -362,8 +362,8 @@ int JudgeHitMyCharDamageW(int x, int y) int JudgeHitMyCharVectLeft(int x, int y) { int hit = 0; - if (gMC.x - gMC.hit.right < (x * 0x10 + 6) * 0x200 - && gMC.x + gMC.hit.right > (x * 0x10 - 6) * 0x200 + if (gMC.x - gMC.hit.back < (x * 0x10 + 6) * 0x200 + && gMC.x + gMC.hit.back > (x * 0x10 - 6) * 0x200 && gMC.y - gMC.hit.top < (y * 0x10 + 6) * 0x200 && gMC.y + gMC.hit.bottom > (y * 0x10 - 6) * 0x200) hit |= 0x1000; @@ -374,8 +374,8 @@ int JudgeHitMyCharVectLeft(int x, int y) int JudgeHitMyCharVectUp(int x, int y) { int hit = 0; - if (gMC.x - gMC.hit.right < (x * 0x10 + 6) * 0x200 - && gMC.x + gMC.hit.right > (x * 0x10 - 6) * 0x200 + if (gMC.x - gMC.hit.back < (x * 0x10 + 6) * 0x200 + && gMC.x + gMC.hit.back > (x * 0x10 - 6) * 0x200 && gMC.y - gMC.hit.top < (y * 0x10 + 6) * 0x200 && gMC.y + gMC.hit.bottom > (y * 0x10 - 6) * 0x200) hit |= 0x2000; @@ -386,8 +386,8 @@ int JudgeHitMyCharVectUp(int x, int y) int JudgeHitMyCharVectRight(int x, int y) { int hit = 0; - if (gMC.x - gMC.hit.right < (x * 0x10 + 6) * 0x200 - && gMC.x + gMC.hit.right > (x * 0x10 - 6) * 0x200 + if (gMC.x - gMC.hit.back < (x * 0x10 + 6) * 0x200 + && gMC.x + gMC.hit.back > (x * 0x10 - 6) * 0x200 && gMC.y - gMC.hit.top < (y * 0x10 + 6) * 0x200 && gMC.y + gMC.hit.bottom > (y * 0x10 - 6) * 0x200) hit |= 0x4000; @@ -398,8 +398,8 @@ int JudgeHitMyCharVectRight(int x, int y) int JudgeHitMyCharVectDown(int x, int y) { int hit = 0; - if (gMC.x - gMC.hit.right < (x * 0x10 + 6) * 0x200 - && gMC.x + gMC.hit.right > (x * 0x10 - 6) * 0x200 + if (gMC.x - gMC.hit.back < (x * 0x10 + 6) * 0x200 + && gMC.x + gMC.hit.back > (x * 0x10 - 6) * 0x200 && gMC.y - gMC.hit.top < (y * 0x10 + 6) * 0x200 && gMC.y + gMC.hit.bottom > (y * 0x10 - 6) * 0x200) hit |= 0x8000; @@ -591,8 +591,8 @@ int JudgeHitMyCharNPC(NPCHAR *npc) if (gMC.y - gMC.hit.top < npc->y + npc->hit.bottom - 0x600 && gMC.y + gMC.hit.bottom > npc->y - npc->hit.top + 0x600 - && gMC.x - gMC.hit.right < npc->x + npc->hit.back - && gMC.x - gMC.hit.right > npc->x) + && gMC.x - gMC.hit.back < npc->x + npc->hit.back + && gMC.x - gMC.hit.back > npc->x) { if (gMC.xm < 0x200) gMC.xm += 0x200; @@ -601,16 +601,16 @@ int JudgeHitMyCharNPC(NPCHAR *npc) if (gMC.y - gMC.hit.top < npc->y + npc->hit.bottom - 0x600 && gMC.y + gMC.hit.bottom > npc->y - npc->hit.top + 0x600 - && gMC.x + gMC.hit.right - 0x200 > npc->x - npc->hit.back - && gMC.x + gMC.hit.right - 0x200 < npc->x) + && gMC.x + gMC.hit.back - 0x200 > npc->x - npc->hit.back + && gMC.x + gMC.hit.back - 0x200 < npc->x) { if (gMC.xm > -0x200) gMC.xm -= 0x200; hit |= 4; } - if (gMC.x - gMC.hit.right < npc->x + npc->hit.back - 0x600 - && gMC.x + gMC.hit.right > npc->x - npc->hit.back + 0x600 + if (gMC.x - gMC.hit.back < npc->x + npc->hit.back - 0x600 + && gMC.x + gMC.hit.back > npc->x - npc->hit.back + 0x600 && gMC.y - gMC.hit.top < npc->y + npc->hit.bottom && gMC.y - gMC.hit.top > npc->y) { @@ -619,8 +619,8 @@ int JudgeHitMyCharNPC(NPCHAR *npc) hit |= 2; } - if (gMC.x - gMC.hit.right < npc->x + npc->hit.back - 0x600 - && gMC.x + gMC.hit.right > npc->x - npc->hit.back + 0x600 + if (gMC.x - gMC.hit.back < npc->x + npc->hit.back - 0x600 + && gMC.x + gMC.hit.back > npc->x - npc->hit.back + 0x600 && gMC.y + gMC.hit.bottom > npc->y - npc->hit.top && gMC.hit.bottom + gMC.y < npc->y + 0x600) { @@ -692,7 +692,7 @@ int JudgeHitMyCharNPC4(NPCHAR *npc) if (fy1 / fx1 > fy2 / fx2) { - if (gMC.x - gMC.hit.right < npc->x + npc->hit.back && gMC.x + gMC.hit.right > npc->x - npc->hit.back) + if (gMC.x - gMC.hit.back < npc->x + npc->hit.back && gMC.x + gMC.hit.back > npc->x - npc->hit.back) { if (gMC.y - gMC.hit.top < npc->y + npc->hit.bottom && gMC.y - gMC.hit.top > npc->y) { @@ -739,22 +739,22 @@ int JudgeHitMyCharNPC4(NPCHAR *npc) { if (gMC.y - gMC.hit.top < npc->y + npc->hit.bottom && gMC.y + gMC.hit.bottom > npc->y - npc->hit.top) { - if (gMC.x - gMC.hit.right < npc->x + npc->hit.back && gMC.x - gMC.hit.right > npc->x) + if (gMC.x - gMC.hit.back < npc->x + npc->hit.back && gMC.x - gMC.hit.back > npc->x) { if (gMC.xm < npc->xm) gMC.xm = npc->xm; - gMC.x = npc->hit.back + npc->x + gMC.hit.right; + gMC.x = npc->hit.back + npc->x + gMC.hit.back; hit |= 1; } - if (gMC.x + gMC.hit.right > npc->x - npc->hit.back && gMC.hit.right + gMC.x < npc->x) + if (gMC.x + gMC.hit.back > npc->x - npc->hit.back && gMC.hit.back + gMC.x < npc->x) { if (gMC.xm > npc->xm) gMC.xm = npc->xm; - gMC.x = npc->x - npc->hit.back - gMC.hit.right; + gMC.x = npc->x - npc->hit.back - gMC.hit.back; hit |= 4; } diff --git a/src/MycParam.cpp b/src/MycParam.cpp index 62527be8..ede5fcdb 100644 --- a/src/MycParam.cpp +++ b/src/MycParam.cpp @@ -1,5 +1,7 @@ #include "MycParam.h" +#include + #include "SDL.h" #include "WindowsWrapper.h" diff --git a/src/NpChar.cpp b/src/NpChar.cpp index 7afd2dcb..590479aa 100644 --- a/src/NpChar.cpp +++ b/src/NpChar.cpp @@ -67,7 +67,7 @@ BOOL LoadEvent(const char *path_event) if (fp == NULL) return FALSE; - //Read "PXE" check + // Read "PXE" check char code[4]; fread(code, 1, 4, fp); if (memcmp(code, gPassPixEve, 3)) @@ -79,20 +79,20 @@ BOOL LoadEvent(const char *path_event) return FALSE; } - //Get amount of NPCs + // Get amount of NPCs #ifdef NONPORTABLE fread(&count, 4, 1, fp); #else count = File_ReadLE32(fp); #endif - //Load NPCs + // Load NPCs memset(gNPC, 0, sizeof(gNPC)); n = 170; for (i = 0; i < count; i++) { - //Get data from file + // Get data from file #ifdef NONPORTABLE fread(&eve, sizeof(EVENT), 1, fp); #else @@ -104,7 +104,7 @@ BOOL LoadEvent(const char *path_event) eve.bits = File_ReadLE16(fp); #endif - //Set NPC parameters + // Set NPC parameters gNPC[n].direct = (eve.bits & npc_altDir) ? 2 : 0; gNPC[n].code_char = eve.code_char; gNPC[n].code_event = eve.code_event; @@ -116,7 +116,7 @@ BOOL LoadEvent(const char *path_event) gNPC[n].exp = gNpcTable[gNPC[n].code_char].exp; SetUniqueParameter(&gNPC[n]); - //Check flags + // Check flags if (gNPC[n].bits & npc_appearSet) { if (GetNPCFlag(gNPC[n].code_flag) == TRUE) @@ -132,7 +132,7 @@ BOOL LoadEvent(const char *path_event) gNPC[n].cond = 0x80; } - //Increase index + // Increase index n++; } @@ -149,7 +149,7 @@ void SetNpChar(int code_char, int x, int y, int xm, int ym, int dir, NPCHAR *npc if (n == NPC_MAX) return; - //Set NPC parameters + // Set NPC parameters memset(&gNPC[n], 0, sizeof(NPCHAR)); gNPC[n].cond |= 0x80u; gNPC[n].direct = dir; @@ -166,7 +166,7 @@ void SetNpChar(int code_char, int x, int y, int xm, int ym, int dir, NPCHAR *npc void SetDestroyNpChar(int x, int y, int w, int num) { - //Create smoke + // Create smoke w /= 0x200; for (int i = 0; i < num; i++) { @@ -175,13 +175,13 @@ void SetDestroyNpChar(int x, int y, int w, int num) SetNpChar(4, x + offset_x, y + offset_y, 0, 0, 0, NULL, 0x100); } - //Flash effect + // Flash effect SetCaret(x, y, 12, 0); } void SetDestroyNpCharUp(int x, int y, int w, int num) { - //Create smoke + // Create smoke w /= 0x200; for (int i = 0; i < num; i++) { @@ -190,7 +190,7 @@ void SetDestroyNpCharUp(int x, int y, int w, int num) SetNpChar(4, x + offset_x, y + offset_y, 0, 0, 1, NULL, 0x100); } - //Flash effect + // Flash effect SetCaret(x, y, 12, 0); } @@ -251,9 +251,11 @@ BOOL SetBulletObject(int x, int y, int val) case 5: tamakazu_ari[t++] = 0; break; + case 10: tamakazu_ari[t++] = 1; break; + default: tamakazu_ari[t] = 0; break; @@ -601,9 +603,11 @@ void DeleteNpCharCode(int code, BOOL bSmoke) case 1: SetDestroyNpChar(gNPC[n].x, gNPC[n].y, gNPC[n].view.back, 4); break; + case 2: SetDestroyNpChar(gNPC[n].x, gNPC[n].y, gNPC[n].view.back, 8); break; + case 3: SetDestroyNpChar(gNPC[n].x, gNPC[n].y, gNPC[n].view.back, 16); break; diff --git a/src/NpChar.h b/src/NpChar.h index b60eed51..3ba59f80 100644 --- a/src/NpChar.h +++ b/src/NpChar.h @@ -55,8 +55,20 @@ struct NPCHAR int count2; int act_no; int act_wait; - RECT hit; - RECT view; + struct + { + int front; + int top; + int back; + int bottom; + } hit; + struct + { + int front; + int top; + int back; + int bottom; + } view; unsigned char shock; int damage_view; int damage; diff --git a/src/NpcAct020.cpp b/src/NpcAct020.cpp index 84156504..f7bc6f6d 100644 --- a/src/NpcAct020.cpp +++ b/src/NpcAct020.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "Game.h" #include "Frame.h" diff --git a/src/NpcAct040.cpp b/src/NpcAct040.cpp index b9002563..dad7b9ef 100644 --- a/src/NpcAct040.cpp +++ b/src/NpcAct040.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "CommonDefines.h" #include "Game.h" diff --git a/src/NpcAct060.cpp b/src/NpcAct060.cpp index b57049c3..8c4589a4 100644 --- a/src/NpcAct060.cpp +++ b/src/NpcAct060.cpp @@ -2,8 +2,8 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "CommonDefines.h" +#include "Draw.h" #include "Flash.h" #include "Frame.h" #include "Game.h" diff --git a/src/NpcAct100.cpp b/src/NpcAct100.cpp index ce481c4c..12203beb 100644 --- a/src/NpcAct100.cpp +++ b/src/NpcAct100.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Bullet.h" #include "Caret.h" #include "Frame.h" @@ -10,7 +9,6 @@ #include "MyChar.h" #include "NpChar.h" #include "Sound.h" -#include "Triangle.h" // Grate void ActNpc100(NPCHAR *npc) diff --git a/src/NpcAct120.cpp b/src/NpcAct120.cpp index 2e0ba946..8a419708 100644 --- a/src/NpcAct120.cpp +++ b/src/NpcAct120.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Bullet.h" #include "Caret.h" #include "Frame.h" diff --git a/src/NpcAct140.cpp b/src/NpcAct140.cpp index a2c78e43..afb1cf92 100644 --- a/src/NpcAct140.cpp +++ b/src/NpcAct140.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Bullet.h" #include "Caret.h" #include "CommonDefines.h" diff --git a/src/NpcAct160.cpp b/src/NpcAct160.cpp index f723aec4..83cb51a3 100644 --- a/src/NpcAct160.cpp +++ b/src/NpcAct160.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "CommonDefines.h" #include "Frame.h" diff --git a/src/NpcAct200.cpp b/src/NpcAct200.cpp index 80db74aa..a458b70e 100644 --- a/src/NpcAct200.cpp +++ b/src/NpcAct200.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Bullet.h" #include "Caret.h" #include "Frame.h" diff --git a/src/NpcAct220.cpp b/src/NpcAct220.cpp index b177be2d..f099dc43 100644 --- a/src/NpcAct220.cpp +++ b/src/NpcAct220.cpp @@ -2,10 +2,7 @@ #include "WindowsWrapper.h" -#include "Back.h" -#include "Bullet.h" #include "Caret.h" -#include "Frame.h" #include "Game.h" #include "MyChar.h" #include "NpChar.h" diff --git a/src/NpcAct240.cpp b/src/NpcAct240.cpp index e9f94375..98567704 100644 --- a/src/NpcAct240.cpp +++ b/src/NpcAct240.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "Frame.h" #include "Game.h" diff --git a/src/NpcAct260.cpp b/src/NpcAct260.cpp index f27f0188..eeaa4000 100644 --- a/src/NpcAct260.cpp +++ b/src/NpcAct260.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "Frame.h" #include "Game.h" diff --git a/src/NpcAct280.cpp b/src/NpcAct280.cpp index 791061b5..296dd084 100644 --- a/src/NpcAct280.cpp +++ b/src/NpcAct280.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Boss.h" #include "Frame.h" #include "Game.h" diff --git a/src/NpcAct300.cpp b/src/NpcAct300.cpp index 0427951d..095e2a86 100644 --- a/src/NpcAct300.cpp +++ b/src/NpcAct300.cpp @@ -4,7 +4,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Boss.h" #include "Bullet.h" #include "Caret.h" diff --git a/src/NpcAct320.cpp b/src/NpcAct320.cpp index 17b4d610..f2b3877d 100644 --- a/src/NpcAct320.cpp +++ b/src/NpcAct320.cpp @@ -1,8 +1,9 @@ #include "NpcAct.h" +#include + #include "WindowsWrapper.h" -#include "Back.h" #include "Bullet.h" #include "Caret.h" #include "Frame.h" @@ -12,7 +13,6 @@ #include "MyChar.h" #include "NpChar.h" #include "Sound.h" -#include "Triangle.h" // Curly (carried, shooting) void ActNpc320(NPCHAR *npc) diff --git a/src/NpcAct340.cpp b/src/NpcAct340.cpp index 6b1ad3f2..d40b3e4c 100644 --- a/src/NpcAct340.cpp +++ b/src/NpcAct340.cpp @@ -2,9 +2,9 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "CommonDefines.h" +#include "Draw.h" #include "Flash.h" #include "Flags.h" #include "Frame.h" diff --git a/src/NpcHit.cpp b/src/NpcHit.cpp index a3e12f90..052815d5 100644 --- a/src/NpcHit.cpp +++ b/src/NpcHit.cpp @@ -68,14 +68,14 @@ void JudgeHitNpCharTriangleA(NPCHAR *npc, int x, int y) && npc->y - npc->hit.top < (y * 0x10 * 0x200) - ((npc->x - (x * 0x10 * 0x200)) / 2) + 0x800 && npc->y + npc->hit.bottom > (y * 0x10 - 8) * 0x200) { - //Clip + // Clip npc->y = (y * 0x10 * 0x200) - ((npc->x - (x * 0x10 * 0x200)) / 2) + 0x800 + npc->hit.top; - //Halt momentum + // Halt momentum if (npc->ym < 0) npc->ym = 0; - //Set that hit a ceiling + // Set that hit a ceiling hit |= 2; } @@ -91,14 +91,14 @@ void JudgeHitNpCharTriangleB(NPCHAR *npc, int x, int y) && npc->y - npc->hit.top < (y * 0x10 * 0x200) - ((npc->x - (x * 0x10 * 0x200)) / 2) - 0x800 && npc->y + npc->hit.bottom > (y * 0x10 - 8) * 0x200) { - //Clip + // Clip npc->y = (y * 0x10 * 0x200) - ((npc->x - (x * 0x10 * 0x200)) / 2) - 0x800 + npc->hit.top; - //Halt momentum + // Halt momentum if (npc->ym < 0) npc->ym = 0; - //Set that hit a ceiling + // Set that hit a ceiling hit |= 2; } @@ -114,14 +114,14 @@ void JudgeHitNpCharTriangleC(NPCHAR *npc, int x, int y) && npc->y - npc->hit.top < (y * 0x10 * 0x200) + ((npc->x - (x * 0x10 * 0x200)) / 2) - 0x800 && npc->y + npc->hit.bottom > (y * 0x10 - 8) * 0x200) { - //Clip + // Clip npc->y = (y * 0x10 * 0x200) + ((npc->x - (x * 0x10 * 0x200)) / 2) - 0x800 + npc->hit.top; - //Halt momentum + // Halt momentum if (npc->ym < 0) npc->ym = 0; - //Set that hit a ceiling + // Set that hit a ceiling hit |= 2; } @@ -137,14 +137,14 @@ void JudgeHitNpCharTriangleD(NPCHAR *npc, int x, int y) && npc->y - npc->hit.top < (y * 0x10 * 0x200) + ((npc->x - (x * 0x10 * 0x200)) / 2) + 0x800 && npc->y + npc->hit.bottom > (y * 0x10 - 8) * 0x200) { - //Clip + // Clip npc->y = (y * 0x10 * 0x200) + ((npc->x - (x * 0x10 * 0x200)) / 2) + 0x800 + npc->hit.top; - //Halt momentum + // Halt momentum if (npc->ym < 0) npc->ym = 0; - //Set that hit a ceiling + // Set that hit a ceiling hit |= 2; } @@ -162,14 +162,14 @@ void JudgeHitNpCharTriangleE(NPCHAR *npc, int x, int y) && npc->y + npc->hit.bottom > (y * 0x10 * 0x200) + ((npc->x - (x * 0x10 * 0x200)) / 2) - 0x800 && npc->y - npc->hit.top < (y * 0x10 + 8) * 0x200) { - //Clip + // Clip npc->y = (y * 0x10 * 0x200) + ((npc->x - (x * 0x10 * 0x200)) / 2) - 0x800 - npc->hit.bottom; - //Halt momentum + // Halt momentum if (npc->ym > 0) npc->ym = 0; - //Set that hit this slope + // Set that hit this slope hit |= 0x28; } @@ -187,14 +187,14 @@ void JudgeHitNpCharTriangleF(NPCHAR *npc, int x, int y) && npc->y + npc->hit.bottom > (y * 0x10 * 0x200) + ((npc->x - (x * 0x10 * 0x200)) / 2) + 0x800 && npc->y - npc->hit.top < (y * 0x10 + 8) * 0x200) { - //Clip + // Clip npc->y = (y * 0x10 * 0x200) + ((npc->x - (x * 0x10 * 0x200)) / 2) + 0x800 - npc->hit.bottom; - //Halt momentum + // Halt momentum if (npc->ym > 0) npc->ym = 0; - //Set that hit this slope + // Set that hit this slope hit |= 0x28; } @@ -212,14 +212,14 @@ void JudgeHitNpCharTriangleG(NPCHAR *npc, int x, int y) && npc->y + npc->hit.bottom > (y * 0x10 * 0x200) - ((npc->x - (x * 0x10 * 0x200)) / 2) + 0x800 && npc->y - npc->hit.top < (y * 0x10 + 8) * 0x200) { - //Clip + // Clip npc->y = (y * 0x10 * 0x200) - ((npc->x - (x * 0x10 * 0x200)) / 2) + 0x800 - npc->hit.bottom; - //Halt momentum + // Halt momentum if (npc->ym > 0) npc->ym = 0; - //Set that hit this slope + // Set that hit this slope hit |= 0x18; } @@ -237,14 +237,14 @@ void JudgeHitNpCharTriangleH(NPCHAR *npc, int x, int y) && npc->y + npc->hit.bottom > (y * 0x10 * 0x200) - ((npc->x - (x * 0x10 * 0x200)) / 2) - 0x800 && npc->y - npc->hit.top < (y * 0x10 + 8) * 0x200) { - //Clip + // Clip npc->y = (y * 0x10 * 0x200) - ((npc->x - (x * 0x10 * 0x200)) / 2) - 0x800 - npc->hit.bottom; - //Halt momentum + // Halt momentum if (npc->ym > 0) npc->ym = 0; - //Set that hit this slope + // Set that hit this slope hit |= 0x18; } @@ -321,12 +321,12 @@ void HitNpCharMap() { switch (GetAttribute(x + offx[j], y + offy[j])) { - //No NPC block + // No NPC block case 0x44: if (gNPC[i].bits & npc_ignore44) break; // Fallthrough - //Block + // Block case 0x03: case 0x05: case 0x41: @@ -334,7 +334,7 @@ void HitNpCharMap() JadgeHitNpCharBlock(&gNPC[i], x + offx[j], y + offy[j]); break; - //Slopes + // Slopes case 0x50: JudgeHitNpCharTriangleA(&gNPC[i], x + offx[j], y + offy[j]); break; @@ -367,14 +367,14 @@ void HitNpCharMap() JudgeHitNpCharTriangleH(&gNPC[i], x + offx[j], y + offy[j]); break; - //Water + // Water case 0x02: case 0x60: case 0x62: JudgeHitNpCharWater(&gNPC[i], x + offx[j], y + offy[j]); break; - //Water block + // Water block case 0x04: case 0x61: case 0x64: @@ -382,7 +382,7 @@ void HitNpCharMap() JudgeHitNpCharWater(&gNPC[i], x + offx[j], y + offy[j]); break; - //Water slopes + // Water slopes case 0x70: JudgeHitNpCharTriangleA(&gNPC[i], x + offx[j], y + offy[j]); JudgeHitNpCharWater(&gNPC[i], x + offx[j], y + offy[j]); @@ -460,24 +460,26 @@ void HitNpCharMap() void LoseNpChar(NPCHAR *npc, BOOL bVanish) { - //Play death sound + // Play death sound PlaySoundObject(npc->destroy_voice, 1); - //Create smoke + // Create smoke switch (npc->size) { case 1: SetDestroyNpChar(npc->x, npc->y, npc->view.back, 3); break; + case 2: SetDestroyNpChar(npc->x, npc->y, npc->view.back, 7); break; + case 3: SetDestroyNpChar(npc->x, npc->y, npc->view.back, 12); break; } - //Create drop + // Create drop if (npc->exp) { int val; @@ -512,10 +514,10 @@ void LoseNpChar(NPCHAR *npc, BOOL bVanish) } } - //Set flag + // Set flag SetNPCFlag(npc->code_flag); - //Create value view + // Create value view if (npc->bits & npc_showDamage) { if ((npc->bits & npc_showDamage) && npc->damage_view) @@ -551,7 +553,7 @@ void HitNpCharBullet() if (gBul[b].damage == -1) continue; - //Check if bullet touches npc + // Check if bullet touches npc bHit = FALSE; if (gNPC[n].bits & npc_shootable && gNPC[n].x - gNPC[n].hit.back < gBul[b].x + gBul[b].enemyXL @@ -568,7 +570,7 @@ void HitNpCharBullet() if (bHit) { - //Damage NPC + // Damage NPC if (gNPC[n].bits & npc_shootable) { gNPC[n].life -= gBul[b].damage; @@ -611,7 +613,7 @@ void HitNpCharBullet() } else if ((gBul[b].bbits & 0x10) == 0) { - //Hit invulnerable NPC + // Hit invulnerable NPC SetCaret((gBul[b].x + gNPC[n].x) / 2, (gBul[b].y + gNPC[n].y) / 2, 2, 2); PlaySoundObject(31, 1); gBul[b].life = 0; @@ -626,3 +628,4 @@ void HitNpCharBullet() LoseNpChar(&gNPC[n], TRUE); } } + diff --git a/src/NpcTbl.cpp b/src/NpcTbl.cpp index 9f9409a3..7a653b99 100644 --- a/src/NpcTbl.cpp +++ b/src/NpcTbl.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include "WindowsWrapper.h" @@ -39,46 +38,46 @@ BOOL LoadNpcTable(const char *path) } #ifdef NONPORTABLE - for (n = 0; n < num; n++) //bits + for (n = 0; n < num; n++) // bits fread(&gNpcTable[n].bits, 2, 1, fp); - for (n = 0; n < num; n++) //life + for (n = 0; n < num; n++) // life fread(&gNpcTable[n].life, 2, 1, fp); - for (n = 0; n < num; n++) //surf + for (n = 0; n < num; n++) // surf fread(&gNpcTable[n].surf, 1, 1, fp); - for (n = 0; n < num; n++) //destroy_voice + for (n = 0; n < num; n++) // destroy_voice fread(&gNpcTable[n].destroy_voice, 1, 1, fp); - for (n = 0; n < num; n++) //hit_voice + for (n = 0; n < num; n++) // hit_voice fread(&gNpcTable[n].hit_voice, 1, 1, fp); - for (n = 0; n < num; n++) //size + for (n = 0; n < num; n++) // size fread(&gNpcTable[n].size, 1, 1, fp); - for (n = 0; n < num; n++) //exp + for (n = 0; n < num; n++) // exp fread(&gNpcTable[n].exp, 4, 1, fp); - for (n = 0; n < num; n++) //damage + for (n = 0; n < num; n++) // damage fread(&gNpcTable[n].damage, 4, 1, fp); - for (n = 0; n < num; n++) //hit + for (n = 0; n < num; n++) // hit fread(&gNpcTable[n].hit, 4, 1, fp); - for (n = 0; n < num; n++) //view + for (n = 0; n < num; n++) // view fread(&gNpcTable[n].view, 4, 1, fp); #else - for (n = 0; n < num; n++) //bits + for (n = 0; n < num; n++) // bits gNpcTable[n].bits = File_ReadLE16(fp); - for (n = 0; n < num; n++) //life + for (n = 0; n < num; n++) // life gNpcTable[n].life = File_ReadLE16(fp); - for (n = 0; n < num; n++) //surf + for (n = 0; n < num; n++) // surf fread(&gNpcTable[n].surf, 1, 1, fp); - for (n = 0; n < num; n++) //destroy_voice + for (n = 0; n < num; n++) // destroy_voice fread(&gNpcTable[n].destroy_voice, 1, 1, fp); - for (n = 0; n < num; n++) //hit_voice + for (n = 0; n < num; n++) // hit_voice fread(&gNpcTable[n].hit_voice, 1, 1, fp); - for (n = 0; n < num; n++) //size + for (n = 0; n < num; n++) // size fread(&gNpcTable[n].size, 1, 1, fp); - for (n = 0; n < num; n++) //exp + for (n = 0; n < num; n++) // exp gNpcTable[n].exp = File_ReadLE32(fp); - for (n = 0; n < num; n++) //damage + for (n = 0; n < num; n++) // damage gNpcTable[n].damage = File_ReadLE32(fp); - for (n = 0; n < num; n++) //hit + for (n = 0; n < num; n++) // hit fread(&gNpcTable[n].hit, 4, 1, fp); - for (n = 0; n < num; n++) //view + for (n = 0; n < num; n++) // view fread(&gNpcTable[n].view, 4, 1, fp); #endif @@ -95,7 +94,7 @@ void ReleaseNpcTable() } } -//Npc function table +// Npc function table NPCFUNCTION gpNpcFuncTbl[361] = { ActNpc000, diff --git a/src/NpcTbl.h b/src/NpcTbl.h index 121cc711..b61455a9 100644 --- a/src/NpcTbl.h +++ b/src/NpcTbl.h @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Draw.h" #include "NpChar.h" struct NPC_TBL_RECT diff --git a/src/Organya.cpp b/src/Organya.cpp index 55568d07..3de9f757 100644 --- a/src/Organya.cpp +++ b/src/Organya.cpp @@ -1,19 +1,21 @@ +// Some of the original source code for this file can be found here: +// https://github.com/shbow/organya/blob/master/source/OrgFile.cpp +// https://github.com/shbow/organya/blob/master/source/OrgPlay.cpp +// https://github.com/shbow/organya/blob/master/source/Sound.cpp +// https://github.com/shbow/organya/blob/master/source/WinTimer.cpp + #include "Organya.h" #include #include #include -#include -#include -#include +#include "SDL.h" #include "WindowsWrapper.h" -#include "CommonDefines.h" #include "Resource.h" #include "Sound.h" -#include "Tags.h" #define PANDUMMY 0xFF #define VOLDUMMY 0xFF @@ -23,8 +25,8 @@ #define MAXMELODY 8 #define MAXDRAM 8 -SOUNDBUFFER* lpORGANBUFFER[8][8][2] = {NULL}; -SOUNDBUFFER** lpDRAMBUFFER = &lpSECONDARYBUFFER[0x96]; +SOUNDBUFFER *lpORGANBUFFER[8][8][2] = {NULL}; +SOUNDBUFFER **lpDRAMBUFFER = &lpSECONDARYBUFFER[0x96]; MUSICINFO info; @@ -34,17 +36,17 @@ BOOL bFadeout = FALSE; BOOL OrganyaNoteAlloc(unsigned short alloc) { - for(int j = 0; j < MAXTRACK; j++) + for (int j = 0; j < MAXTRACK; j++) { info.tdata[j].wave_no = 0; info.tdata[j].note_list = NULL; info.tdata[j].note_p = new NOTELIST[alloc]; - if(info.tdata[j].note_p == NULL) + if (info.tdata[j].note_p == NULL) { - for(int i = 0; i < MAXTRACK; i++) + for (int i = 0; i < MAXTRACK; i++) { - if(info.tdata[i].note_p != NULL) + if (info.tdata[i].note_p != NULL) { delete[] info.tdata[i].note_p; info.tdata[j].note_p = NULL; // Uses j instead of i @@ -54,7 +56,7 @@ BOOL OrganyaNoteAlloc(unsigned short alloc) return FALSE; } - for(int i = 0; i < alloc; i++) + for (int i = 0; i < alloc; i++) { (info.tdata[j].note_p + i)->from = NULL; (info.tdata[j].note_p + i)->to = NULL; @@ -65,48 +67,50 @@ BOOL OrganyaNoteAlloc(unsigned short alloc) } } - for(int j = 0; j < MAXMELODY; j++) + for (int j = 0; j < MAXMELODY; j++) MakeOrganyaWave(j, info.tdata[j].wave_no, info.tdata[j].pipi); - //for(int j = 0; j < MAXDRAM; j++) - // InitDramObject(j); + // for(int j = 0; j < MAXDRAM; j++) + // InitDramObject(j); - //this->track = 0; + // this->track = 0; return FALSE; } void OrganyaReleaseNote() { - for(int i = 0; i < MAXTRACK; i++) + for (int i = 0; i < MAXTRACK; i++) { - if(info.tdata[i].note_p != NULL) + if (info.tdata[i].note_p != NULL) { #ifdef FIX_BUGS delete[] info.tdata[i].note_p; #else - delete info.tdata[i].note_p; // should be delete[] + delete info.tdata[i].note_p; // Should be delete[] #endif info.tdata[i].note_p = NULL; } } } -//Wave playing and loading -typedef struct { +// Wave playing and loading +typedef struct +{ short wave_size; short oct_par; short oct_size; } OCTWAVE; -OCTWAVE oct_wave[8] = { - { 256, 1, 4 }, //0 Oct - { 256, 2, 8 }, //1 Oct - { 128, 4, 12 }, //2 Oct - { 128, 8, 16 }, //3 Oct - { 64, 16, 20 }, //4 Oct - { 32, 32, 24 }, //5 Oct - { 16, 64, 28 }, //6 Oct - { 8,128, 32 }, //7 Oct +OCTWAVE oct_wave[8] = +{ + { 256, 1, 4 }, // 0 Oct + { 256, 2, 8 }, // 1 Oct + { 128, 4, 12 }, // 2 Oct + { 128, 8, 16 }, // 3 Oct + { 64, 16, 20 }, // 4 Oct + { 32, 32, 24 }, // 5 Oct + { 16, 64, 28 }, // 6 Oct + { 8,128, 32 }, // 7 Oct }; BOOL MakeSoundObject8(signed char *wavep, signed char track, signed char pipi) @@ -118,17 +122,17 @@ BOOL MakeSoundObject8(signed char *wavep, signed char track, signed char pipi) size_t wave_size = oct_wave[j].wave_size; size_t data_size = pipi ? wave_size * oct_wave[j].oct_size : wave_size; - //Create sound buffer + // Create sound buffer lpORGANBUFFER[track][j][k] = new SOUNDBUFFER(data_size); - //Get wave data + // Get wave data unsigned char *wp = new unsigned char[data_size]; unsigned char *wp_sub = wp; size_t wav_tp = 0; for (size_t i = 0; i < data_size; i++) { - unsigned char work = *(wavep+wav_tp); + unsigned char work = *(wavep + wav_tp); work += 0x80; *wp_sub = work; @@ -140,7 +144,7 @@ BOOL MakeSoundObject8(signed char *wavep, signed char track, signed char pipi) wp_sub++; } - //Copy wave data to sound buffer + // Copy wave data to sound buffer unsigned char *buf; lpORGANBUFFER[track][j][k]->Lock(&buf, NULL); memcpy(buf, wp, data_size); @@ -153,13 +157,15 @@ BOOL MakeSoundObject8(signed char *wavep, signed char track, signed char pipi) return TRUE; } -//Playing melody tracks -short freq_tbl[12] = { 262,277,294,311,330,349,370,392,415,440,466,494 }; +// Playing melody tracks +short freq_tbl[12] = {262, 277, 294, 311, 330, 349, 370, 392, 415, 440, 466, 494}; void ChangeOrganFrequency(unsigned char key, signed char track, long a) { - for (int j = 0; j < 8; j++) { - for (int i = 0; i < 2; i++) { + for (int j = 0; j < 8; j++) + { + for (int i = 0; i < 2; i++) + { lpORGANBUFFER[track][j][i]->SetFrequency(((oct_wave[j].wave_size * freq_tbl[key]) * oct_wave[j].oct_par) / 8 + (a - 1000)); } } @@ -172,21 +178,21 @@ unsigned char key_twin[MAXTRACK] = {0}; void ChangeOrganPan(unsigned char key, unsigned char pan, signed char track) { - if(old_key[track] != PANDUMMY) - lpORGANBUFFER[track][old_key[track]/12][key_twin[track]]->SetPan((pan_tbl[pan] - 0x100) * 10); + if (old_key[track] != PANDUMMY) + lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->SetPan((pan_tbl[pan] - 0x100) * 10); } void ChangeOrganVolume(int no, long volume, signed char track) { - if(old_key[track] != VOLDUMMY) - lpORGANBUFFER[track][old_key[track]/12][key_twin[track]]->SetVolume((volume - 0xFF) * 8); + if (old_key[track] != VOLDUMMY) + lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->SetVolume((volume - 0xFF) * 8); } void PlayOrganObject(unsigned char key, int mode, signed char track, long freq) { - if (lpORGANBUFFER[track][key/12][key_twin[track]] != NULL) + if (lpORGANBUFFER[track][key / 12][key_twin[track]] != NULL) { - switch(mode) + switch (mode) { case 0: if (old_key[track] != 0xFF) @@ -219,15 +225,15 @@ void PlayOrganObject(unsigned char key, int mode, signed char track, long freq) { lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->Play(false); key_twin[track]++; - if(key_twin[track] == 2) + if (key_twin[track] == 2) key_twin[track] = 0; lpORGANBUFFER[track][key / 12][key_twin[track]]->Play(true); } else { - lpORGANBUFFER[track][old_key[track]/12][key_twin[track]]->Play(false); + lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->Play(false); key_twin[track]++; - if(key_twin[track] == 2) + if (key_twin[track] == 2) key_twin[track] = 0; ChangeOrganFrequency(key % 12, track, freq); lpORGANBUFFER[track][key / 12][key_twin[track]]->Play(true); @@ -235,20 +241,20 @@ void PlayOrganObject(unsigned char key, int mode, signed char track, long freq) } break; } - } + } } -//Release tracks +// Release tracks void ReleaseOrganyaObject(signed char track) { - for(int i = 0; i < 8; i++) + for (int i = 0; i < 8; i++) { - if(lpORGANBUFFER[track][i][0] != NULL) + if (lpORGANBUFFER[track][i][0] != NULL) { lpORGANBUFFER[track][i][0]->Release(); lpORGANBUFFER[track][i][0] = NULL; } - if(lpORGANBUFFER[track][i][1] != NULL) + if (lpORGANBUFFER[track][i][1] != NULL) { lpORGANBUFFER[track][i][1]->Release(); lpORGANBUFFER[track][i][1] = NULL; @@ -256,7 +262,7 @@ void ReleaseOrganyaObject(signed char track) } } -//Handling WAVE100 +// Handling WAVE100 signed char wave_data[100][0x100]; BOOL InitWaveData100() @@ -271,10 +277,10 @@ BOOL InitWaveData100() return TRUE; } -//Create org wave +// Create org wave BOOL MakeOrganyaWave(signed char track, signed char wave_no, signed char pipi) { - if(wave_no > 99) + if (wave_no > 99) { printf("WARNING: track %d has out-of-range wave_no %d\n", track, wave_no); return FALSE; @@ -285,7 +291,7 @@ BOOL MakeOrganyaWave(signed char track, signed char wave_no, signed char pipi) return TRUE; } -//Dram +// Dram void ChangeDramFrequency(unsigned char key, signed char track) { lpDRAMBUFFER[track]->SetFrequency(key * 800 + 100); @@ -303,58 +309,61 @@ void ChangeDramVolume(long volume, signed char track) void PlayDramObject(unsigned char key, int mode, signed char track) { - switch(mode) + switch (mode) { case 0: lpDRAMBUFFER[track]->Stop(); lpDRAMBUFFER[track]->SetCurrentPosition(0); break; + case 1: lpDRAMBUFFER[track]->Stop(); lpDRAMBUFFER[track]->SetCurrentPosition(0); ChangeDramFrequency(key, track); lpDRAMBUFFER[track]->Play(false); break; + case 2: break; + case -1: break; } } -//Play data +// Play data long play_p; NOTELIST *play_np[MAXTRACK]; long now_leng[MAXMELODY] = {0}; void OrganyaPlayData() { - //Handle fading out + // Handle fading out if (bFadeout && gOrgVolume) gOrgVolume -= 2; if (gOrgVolume < 0) gOrgVolume = 0; - //Play melody - for(int i = 0; i < MAXMELODY; i++) + // Play melody + for (int i = 0; i < MAXMELODY; i++) { if (play_np[i] != NULL && play_p == play_np[i]->x) { - if(play_np[i]->y != KEYDUMMY) + if (play_np[i]->y != KEYDUMMY) { - PlayOrganObject(play_np[i]->y,-1,i,info.tdata[i].freq); + PlayOrganObject(play_np[i]->y, -1, i, info.tdata[i].freq); now_leng[i] = play_np[i]->length; } - if(play_np[i]->pan != PANDUMMY) - ChangeOrganPan(play_np[i]->y,play_np[i]->pan, i); - if(play_np[i]->volume != VOLDUMMY) + if (play_np[i]->pan != PANDUMMY) + ChangeOrganPan(play_np[i]->y, play_np[i]->pan, i); + if (play_np[i]->volume != VOLDUMMY) gTrackVol[i] = play_np[i]->volume; play_np[i] = play_np[i]->to; } - if (now_leng[i] == 0 ) + if (now_leng[i] == 0) PlayOrganObject(0, 2, i, info.tdata[i].freq); if (now_leng[i] > 0) @@ -364,16 +373,16 @@ void OrganyaPlayData() ChangeOrganVolume(play_np[i]->y, gOrgVolume * gTrackVol[i] / 0x7F, i); } - for(int i = MAXMELODY; i < MAXTRACK; i++) + for (int i = MAXMELODY; i < MAXTRACK; i++) { if (play_np[i] != NULL && play_p == play_np[i]->x) { if (play_np[i]->y != KEYDUMMY) - PlayDramObject(play_np[i]->y,1,i-MAXMELODY); + PlayDramObject(play_np[i]->y, 1, i - MAXMELODY); - if(play_np[i]->pan != PANDUMMY) - ChangeDramPan(play_np[i]->pan,i-MAXMELODY); - if(play_np[i]->volume != VOLDUMMY) + if (play_np[i]->pan != PANDUMMY) + ChangeDramPan(play_np[i]->pan, i - MAXMELODY); + if (play_np[i]->volume != VOLDUMMY) gTrackVol[i] = play_np[i]->volume; play_np[i] = play_np[i]->to; @@ -383,9 +392,9 @@ void OrganyaPlayData() ChangeDramVolume(gOrgVolume * gTrackVol[i] / 0x7F, i - MAXMELODY); } - //Looping + // Looping play_p++; - if(play_p >= info.end_x) + if (play_p >= info.end_x) { play_p = info.repeat_x; SetPlayPointer(play_p); @@ -407,35 +416,40 @@ void SetPlayPointer(long x) #define READ_LE16(pointer) pointer[0] | (pointer[1] << 8); pointer += 2; #define READ_LE32(pointer) pointer[0] | (pointer[1] << 8) | (pointer[2] << 16) | (pointer[3] << 24); pointer += 4; -//Load organya file +// Load organya file void LoadOrganya(const char *name) { - //Unload previous things + // Unload previous things OrganyaReleaseNote(); memset(&info, 0, sizeof(info)); OrganyaNoteAlloc(0xFFFF); - //Stop currently playing notes + // Stop currently playing notes memset(play_np, 0, sizeof(play_np)); memset(old_key, 0xFF, sizeof(old_key)); memset(key_on, 0, sizeof(key_on)); memset(key_twin, 0, sizeof(key_twin)); memset(now_leng, 0, sizeof(now_leng)); - //Open file + // Open file printf("Loading org %s\n", name); const unsigned char *p = FindResource(name, "ORG", NULL); - //Version Check + // Version Check unsigned char ver = 0; char pass_check[6]; memcpy(pass_check, p, 6); p += 6; - if (!memcmp(pass_check, "Org-01", 6))ver = 1; - if (!memcmp(pass_check, "Org-02", 6))ver = 2; - //if (!memcmp(pass_check, "Org-03", 6))ver = 2; + if (!memcmp(pass_check, "Org-01", 6)) + ver = 1; + + if (!memcmp(pass_check, "Org-02", 6)) + ver = 2; + + // if (!memcmp(pass_check, "Org-03", 6)) + // ver = 2; if (!ver) { @@ -443,14 +457,15 @@ void LoadOrganya(const char *name) return; } - //Set song information + // Set song information info.wait = READ_LE16(p); info.line = *p++; info.dot = *p++; info.repeat_x = READ_LE32(p); info.end_x = READ_LE32(p); - for (int i = 0; i < 16; i++) { + for (int i = 0; i < 16; i++) + { info.tdata[i].freq = READ_LE16(p); info.tdata[i].wave_no = *p++; const signed char pipi = *p++; @@ -458,73 +473,81 @@ void LoadOrganya(const char *name) info.tdata[i].note_num = READ_LE16(p); } - //Load notes + // Load notes NOTELIST *np; - for (int j = 0; j < 16; j++) { - //The first note from is NULL - if (info.tdata[j].note_num == 0) { + for (int j = 0; j < 16; j++) + { + // The first note from is NULL + if (info.tdata[j].note_num == 0) + { info.tdata[j].note_list = NULL; continue; } - //Make note list + // Make note list np = info.tdata[j].note_p; info.tdata[j].note_list = info.tdata[j].note_p; np->from = NULL; np->to = (np + 1); np++; - for (int i = 1; i < info.tdata[j].note_num; i++) { + for (int i = 1; i < info.tdata[j].note_num; i++) + { np->from = (np - 1); np->to = (np + 1); np++; } - //The last note to is NULL + // The last note to is NULL np--; np->to = NULL; - //Set note properties - np = info.tdata[j].note_p; //X position - for (int i = 0; i < info.tdata[j].note_num; i++) { + // Set note properties + np = info.tdata[j].note_p; // X position + for (int i = 0; i < info.tdata[j].note_num; i++) + { np->x = READ_LE32(p); np++; } - np = info.tdata[j].note_p; //Y position - for (int i = 0; i < info.tdata[j].note_num; i++) { + np = info.tdata[j].note_p; // Y position + for (int i = 0; i < info.tdata[j].note_num; i++) + { np->y = *p++; np++; } - np = info.tdata[j].note_p; //Length - for (int i = 0; i < info.tdata[j].note_num; i++) { + np = info.tdata[j].note_p; // Length + for (int i = 0; i < info.tdata[j].note_num; i++) + { np->length = *p++; np++; } - np = info.tdata[j].note_p; //Volume - for (int i = 0; i < info.tdata[j].note_num; i++) { + np = info.tdata[j].note_p; // Volume + for (int i = 0; i < info.tdata[j].note_num; i++) + { np->volume = *p++; np++; } - np = info.tdata[j].note_p; //Pan - for (int i = 0; i < info.tdata[j].note_num; i++) { + np = info.tdata[j].note_p; // Pan + for (int i = 0; i < info.tdata[j].note_num; i++) + { np->pan = *p++; np++; } } - //Create waves + // Create waves for (int j = 0; j < 8; j++) MakeOrganyaWave(j, info.tdata[j].wave_no, info.tdata[j].pipi); - //Reset position + // Reset position SetPlayPointer(0); - //Set as loaded + // Set as loaded info.loaded = TRUE; } @@ -542,7 +565,7 @@ unsigned int GetOrganyaPosition() void PlayOrganyaMusic() { - //Start timer + // Start timer OrganyaStartTimer(info.wait); } @@ -559,10 +582,10 @@ BOOL ChangeOrganyaVolume(signed int volume) void StopOrganyaMusic() { - //Stop timer + // Stop timer OrganyaEndTimer(); - //Stop notes + // Stop notes for (int i = 0; i < MAXMELODY; i++) PlayOrganObject(0, 2, i, 0); @@ -576,7 +599,7 @@ void SetOrganyaFadeout() bFadeout = TRUE; } -//Org timer +// Org timer SDL_Thread *OrganyaTimer = NULL; BOOL bEndTimer = FALSE; @@ -584,27 +607,27 @@ int OrganyaPlayTimer(void *ptr) { SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH); - //Set time for next step to play + // Set time for next step to play Uint32 NextTick = SDL_GetTicks() + info.wait; while (bEndTimer == FALSE) { if (info.loaded) { - //Play music + // Play music OrganyaPlayData(); - //Wait until this step is over + // Wait until this step is over while (NextTick > SDL_GetTicks()) SDL_Delay(1); - //Get time for next step to play + // Get time for next step to play while (NextTick <= SDL_GetTicks()) NextTick += info.wait; } else { - //Wait until the org is loaded + // Wait until the org is loaded SDL_Delay(1); } } @@ -621,24 +644,24 @@ void OrganyaStartTimer(unsigned int wait) void OrganyaEndTimer() { - bEndTimer = TRUE; //Tell thread to end - SDL_WaitThread(OrganyaTimer, NULL); //Wait for thread to end + bEndTimer = TRUE; // Tell thread to end + SDL_WaitThread(OrganyaTimer, NULL); // Wait for thread to end OrganyaTimer = NULL; } -//Start and end organya +// Start and end organya void StartOrganya() { - //Initialize org stuff + // Initialize org stuff InitWaveData100(); } void EndOrganya() { - //End timer + // End timer OrganyaEndTimer(); - //Release everything related to org + // Release everything related to org OrganyaReleaseNote(); for (int i = 0; i < MAXMELODY; i++) diff --git a/src/Organya.h b/src/Organya.h index 78fdc55d..d6429a85 100644 --- a/src/Organya.h +++ b/src/Organya.h @@ -3,7 +3,8 @@ #include "WindowsWrapper.h" //Below are Organya song data structures -struct NOTELIST { +struct NOTELIST +{ NOTELIST *from; //Previous address NOTELIST *to; //Next address @@ -15,7 +16,8 @@ struct NOTELIST { }; //Track data * 8 -struct TRACKDATA { +struct TRACKDATA +{ unsigned short freq; //Frequency (1000 is default) unsigned char wave_no; //Waveform No. signed char pipi; @@ -26,7 +28,8 @@ struct TRACKDATA { }; //Unique information held in songs -struct MUSICINFO { +struct MUSICINFO +{ unsigned short wait; BOOL loaded; BOOL playing; diff --git a/src/PixTone.cpp b/src/PixTone.cpp index 02b3da2a..98aad6ea 100644 --- a/src/PixTone.cpp +++ b/src/PixTone.cpp @@ -1,7 +1,6 @@ #include "PixTone.h" #include -#include #include #include "WindowsWrapper.h" @@ -140,13 +139,13 @@ BOOL MakePixelWaveData(const PIXTONEPARAMETER *ptp, unsigned char *pData) c = (int)dVolume % 256; d = (int)((double)(i * 0x100) / ptp->size); pData[i] = gWaveModelTable[ptp->oMain.model][a] - * ptp->oMain.top - / 64 - * (gWaveModelTable[ptp->oVolume.model][c] * ptp->oVolume.top / 64 + 64) - / 64 - * envelopeTable[d] - / 64 - + 128; + * ptp->oMain.top + / 64 + * (gWaveModelTable[ptp->oVolume.model][c] * ptp->oVolume.top / 64 + 64) + / 64 + * envelopeTable[d] + / 64 + + 128; if (gWaveModelTable[ptp->oPitch.model][b] < 0) dMain = d1 - d1 * 0.5 * -gWaveModelTable[ptp->oPitch.model][b] * ptp->oPitch.top / 64.0 / 64.0 + dMain; diff --git a/src/Profile.cpp b/src/Profile.cpp index 68ce7255..dc2a2f9b 100644 --- a/src/Profile.cpp +++ b/src/Profile.cpp @@ -48,18 +48,18 @@ BOOL SaveProfile(const char *name) const char *FLAG = "FLAG"; char path[PATH_LENGTH]; - //Get path + // Get path if (name) sprintf(path, "%s/%s", gModulePath, name); else sprintf(path, "%s/%s", gModulePath, gDefaultName); - //Open file + // Open file fp = fopen(path, "wb"); if (fp == NULL) return FALSE; - //Set up profile + // Set up profile memset(&profile, 0, sizeof(PROFILE)); memcpy(profile.code, gProfileCode, sizeof(profile.code)); memcpy(profile.FLAG, FLAG, sizeof(profile.FLAG)); @@ -82,7 +82,7 @@ BOOL SaveProfile(const char *name) memcpy(profile.permit_mapping, gMapping, sizeof(profile.permit_mapping)); memcpy(profile.flags, gFlagNPC, sizeof(profile.flags)); - //Write to file + // Write to file #ifdef NONPORTABLE fwrite(&profile, sizeof(PROFILE), 1, fp); #else @@ -127,7 +127,7 @@ BOOL SaveProfile(const char *name) BOOL LoadProfile(const char *name) { - //Get path + // Get path char path[PATH_LENGTH]; if (name) @@ -135,14 +135,14 @@ BOOL LoadProfile(const char *name) else sprintf(path, "%s/%s", gModulePath, gDefaultName); - //Open file + // Open file PROFILE profile; FILE *fp = fopen(path, "rb"); if (fp == NULL) return FALSE; - //Check header code + // Check header code fread(profile.code, 8, 1, fp); if (memcmp(profile.code, gProfileCode, 8)) { @@ -152,7 +152,7 @@ BOOL LoadProfile(const char *name) return FALSE; } - //Read data + // Read data fseek(fp, 0, SEEK_SET); memset(&profile, 0, sizeof(PROFILE)); #ifdef NONPORTABLE @@ -194,7 +194,7 @@ BOOL LoadProfile(const char *name) #endif fclose(fp); - //Set things + // Set things gSelectedArms = profile.select_arms; gSelectedItem = profile.select_item; gCounter = profile.counter; @@ -205,13 +205,13 @@ BOOL LoadProfile(const char *name) memcpy(gMapping, profile.permit_mapping, sizeof(gMapping)); memcpy(gFlagNPC, profile.flags, sizeof(gFlagNPC)); - //Load stage + // Load stage ChangeMusic(profile.music); InitMyChar(); if (!TransferStage(profile.stage, 0, 0, 1)) return FALSE; - //Set character properties + // Set character properties gMC.equip = profile.equip; gMC.unit = profile.unit; gMC.direct = profile.direct; @@ -229,7 +229,7 @@ BOOL LoadProfile(const char *name) gMC.rect_arms.top = 32 * (gArmsData[gSelectedArms].code / 10); gMC.rect_arms.bottom = gMC.rect_arms.top + 16; - //Reset stuff + // Reset stuff ClearFade(); SetFrameMyChar(); SetFrameTargetMyChar(16); @@ -241,7 +241,7 @@ BOOL LoadProfile(const char *name) return TRUE; } -BOOL InitializeGame() +BOOL InitializeGame(HWND hWnd) { InitMyChar(); gSelectedArms = 0; @@ -254,20 +254,22 @@ BOOL InitializeGame() InitFlags(); if (!TransferStage(13, 200, 10, 8)) { - // TODO - restore this when ghWnd is available -/*#if defined(NONPORTABLE) && defined(WINDOWS) -#ifdef JAPANESE - MessageBoxA(ghWnd, "ステージの読み込みに失敗", "エラー", MB_OK); -#else - MessageBoxA(ghWnd, "Failed to load stage", "Error", MB_OK); -#endif -#else*/ -#ifdef JAPANESE - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージの読み込みに失敗", NULL); -#else - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Failed to load stage", NULL); -#endif -//#endif + #if defined(NONPORTABLE) && defined(WINDOWS) + #ifdef JAPANESE + MessageBoxA(hWnd, "ステージの読み込みに失敗", "エラー", MB_OK); + #else + MessageBoxA(hWnd, "Failed to load stage", "Error", MB_OK); + #endif + #else + (void)hWnd; + + #ifdef JAPANESE + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージの読み込みに失敗", NULL); + #else + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Failed to load stage", NULL); + #endif + #endif + return FALSE; } diff --git a/src/Profile.h b/src/Profile.h index 8c4a1947..4441a0e2 100644 --- a/src/Profile.h +++ b/src/Profile.h @@ -33,4 +33,4 @@ struct PROFILE BOOL IsProfile(); BOOL SaveProfile(const char *name); BOOL LoadProfile(const char *name); -BOOL InitializeGame(); +BOOL InitializeGame(HWND hWnd); diff --git a/src/SelStage.cpp b/src/SelStage.cpp index 1664e6eb..aa4d3a02 100644 --- a/src/SelStage.cpp +++ b/src/SelStage.cpp @@ -4,6 +4,7 @@ #include "WindowsWrapper.h" +#include "CommonDefines.h" #include "Draw.h" #include "Escape.h" #include "KeyControl.h" diff --git a/src/Shoot.cpp b/src/Shoot.cpp index 8955e670..c2babebf 100644 --- a/src/Shoot.cpp +++ b/src/Shoot.cpp @@ -1,5 +1,7 @@ #include "Shoot.h" +#include "WindowsWrapper.h" + #include "ArmsItem.h" #include "Bullet.h" #include "Caret.h" diff --git a/src/Sound.cpp b/src/Sound.cpp index 2fb0c828..225c211c 100644 --- a/src/Sound.cpp +++ b/src/Sound.cpp @@ -1,12 +1,14 @@ +// Some of the original source code for this file can be found here: +// https://github.com/shbow/organya/blob/master/source/Sound.cpp + #include "Sound.h" -#include -#include +#include #include -#include -#include +#include +#include -#include +#include "SDL.h" #include "WindowsWrapper.h" @@ -16,9 +18,9 @@ #define FREQUENCY 44100 #ifdef RASPBERRY_PI -#define STREAM_SIZE 0x400 +#define STREAM_SIZE 0x400 // Larger buffer to prevent stutter #else -#define STREAM_SIZE (FREQUENCY / 200) +#define STREAM_SIZE 0x100 // FREQUENCY/200 rounded to the nearest power of 2 (SDL2 *needs* a power-of-2 buffer size) #endif #define clamp(x, y, z) (((x) > (z)) ? (z) : ((x) < (y)) ? (y) : (x)) @@ -170,7 +172,7 @@ void SOUNDBUFFER::Mix(float *buffer, size_t frames) const float sample2 = ((looping || (((size_t)samplePosition) + 1) < size) ? data[(((size_t)samplePosition) + 1) % size] : 128.0f); //Interpolate sample - const float subPos = (float)std::fmod(samplePosition, 1.0); + const float subPos = (float)fmod(samplePosition, 1.0); const float sampleA = sample1 + (sample2 - sample1) * subPos; //Convert sample to float32 @@ -187,7 +189,7 @@ void SOUNDBUFFER::Mix(float *buffer, size_t frames) { if (looping) { - samplePosition = std::fmod(samplePosition, size); + samplePosition = fmod(samplePosition, size); looped = true; } else diff --git a/src/Stage.cpp b/src/Stage.cpp index c8424bb6..744026ff 100644 --- a/src/Stage.cpp +++ b/src/Stage.cpp @@ -18,7 +18,6 @@ #include "MyChar.h" #include "NpChar.h" #include "Organya.h" -#include "Tags.h" #include "TextScr.h" #include "ValueView.h" diff --git a/src/TextScr.cpp b/src/TextScr.cpp index e4f2f112..8200eeda 100644 --- a/src/TextScr.cpp +++ b/src/TextScr.cpp @@ -558,7 +558,7 @@ int TextScriptProc() char c[3]; int w, x, y, z; int i; - int length; + char str[72]; RECT rcSymbol = {64, 48, 72, 56}; @@ -694,13 +694,20 @@ int TextScriptProc() y = GetTextScriptNo(gTS.p_read + 19); if (!TransferStage(z, w, x, y)) { - #ifdef JAPANESE - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージの読み込みに失敗", NULL); + #if defined(NONPORTABLE) && defined(WINDOWS) + #ifdef JAPANESE + MessageBoxA(ghWnd, "ステージの読み込みに失敗", "エラー", MB_OK); + #else + MessageBoxA(ghWnd, "Failed to load stage", "Error", MB_OK); + #endif #else - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Failed to load stage", NULL); + #ifdef JAPANESE + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージの読み込みに失敗", NULL); + #else + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Failed to load stage", NULL); + #endif #endif - //MessageBoxA(ghWnd, "ステージの読み込みに失敗", "エラー", 0); return 0; } } @@ -942,7 +949,12 @@ int TextScriptProc() } else if (IS_COMMAND('S','P','S')) { + #ifdef FIX_BUGS + SetNoise(2, 0); + #else + // x is not initialised. This bug isn't too bad, since that parameter's not used when the first one is set to 2, but still. SetNoise(2, x); + #endif gTS.p_read += 4; } else if (IS_COMMAND('C','P','S')) @@ -1157,7 +1169,7 @@ int TextScriptProc() } else if (IS_COMMAND('I','N','I')) { - InitializeGame(); + InitializeGame(ghWnd); gTS.p_read += 4; } else if (IS_COMMAND('S','V','P')) @@ -1168,7 +1180,7 @@ int TextScriptProc() else if (IS_COMMAND('L','D','P')) { if (!LoadProfile(NULL)) - InitializeGame(); + InitializeGame(ghWnd); } else if (IS_COMMAND('F','A','C')) { @@ -1180,7 +1192,7 @@ int TextScriptProc() } gTS.p_read += 8; } - else if (IS_COMMAND('F','A','C')) + else if (IS_COMMAND('F','A','C')) // Duplicate command { z = GetTextScriptNo(gTS.p_read + 4); if (gTS.face != (signed char)z) @@ -1243,15 +1255,21 @@ int TextScriptProc() { char str_0[0x40]; #ifdef JAPANESE - sprintf(str_0, "不明のコード:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]); - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", str_0, NULL); + sprintf(str_0, "不明のコード:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]); + #if defined(NONPORTABLE) && defined(WINDOWS) + MessageBoxA(NULL, str_0, "エラー", MB_OK); + #else + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", str_0, NULL); + #endif #else - sprintf(str_0, "Unknown code:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]); - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", str_0, NULL); + sprintf(str_0, "Unknown code:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]); + #if defined(NONPORTABLE) && defined(WINDOWS) + MessageBoxA(NULL, str_0, "Error", MB_OK); + #else + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", str_0, NULL); + #endif #endif - //MessageBoxA(0, str_0, "エラー", 0); - return 0; } } @@ -1272,7 +1290,6 @@ int TextScriptProc() else if (gTS.flags & 0x10) { //SAT/CAT/TUR printing - char str[72]; x = gTS.p_read; //Break if reaches command, or new-line while (gTS.data[x] != '<' && gTS.data[x] != '\r') @@ -1285,9 +1302,9 @@ int TextScriptProc() } //Get text to copy - length = x - gTS.p_read; - memcpy(str, &gTS.data[gTS.p_read], length); - str[length] = 0; + y = x - gTS.p_read; + memcpy(str, &gTS.data[gTS.p_read], y); + str[y] = 0; gTS.p_write = x; @@ -1296,7 +1313,7 @@ int TextScriptProc() sprintf(&text[gTS.line % 4 * 0x40], str); //Check if should move to next line (prevent a memory overflow, come on guys, this isn't a leftover of pixel trying to make text wrapping) - gTS.p_read += length; + gTS.p_read += y; if (gTS.p_write >= 35) CheckNewLine(); diff --git a/src/ValueView.cpp b/src/ValueView.cpp index 41ea45e9..bb629f6c 100644 --- a/src/ValueView.cpp +++ b/src/ValueView.cpp @@ -3,7 +3,6 @@ #include "WindowsWrapper.h" #include "Draw.h" -#include "Game.h" #include "ValueView.h" #define VALUEVIEW_MAX 0x10 diff --git a/src/WindowsWrapper.h b/src/WindowsWrapper.h index 8feb6218..ca0d6229 100644 --- a/src/WindowsWrapper.h +++ b/src/WindowsWrapper.h @@ -1,7 +1,13 @@ #pragma once -int rep_rand(); -void rep_srand(unsigned int seed); +#ifdef WINDOWS +#include +// Avoid name collisions +#undef DrawText +#undef FindResource +#else + +typedef int HWND; typedef int BOOL; @@ -13,26 +19,22 @@ typedef int BOOL; #define TRUE 1 #endif +struct RECT +{ + long left; + long top; + long right; + long bottom; +}; +#endif + #define SET_RECT(rect, l, t, r, b) \ rect.left = l; \ rect.top = t; \ rect.right = r; \ rect.bottom = b; -struct RECT -{ - union - { - int left; - int front; - }; - int top; - union - { - int right; - int back; - }; - int bottom; -}; +int rep_rand(); +void rep_srand(unsigned int seed); BOOL SystemTask();