feat: d3d9-monitor-check tool (#322)

A separate application to run the infamous IIDX “monitor check”.

The on-screen output has been enhanced to provide more
detailed information about the on-going process. The tool
furthermore allows basic querying of adapter and adapter
modes information from the command line. These additional
options can be useful to gather more debug information
or select correct parameters for the monitor test from actually
supported mode parameters by the adapter.

The tool has been tested on an actual cabinet with nvgpu
setting different custom timings. The accuracy seems to be
even higher than what IIDX’s monitor check is actually showing.
For example, with a custom timing of 59.900, the tool yields 59.902.
Meanwhile, the monitor check of iidx 29 59.8981 hz to 59.8997 hz
on screen.

This doesn’t mean the game’s getting inaccurate values. The game
actually syncs and plays just fine. However, the game’s monitor check
cannot be used as a reference for “getting the avg. refresh rate”
value as an input parameter for other tools, e.g. chart patching with
btools.

Co-authored-by: icex2 <djh.icex2@gmail.com>

Dockerfile.dev

@@ -1,21 +0,0 @@
-FROM --platform=amd64 debian:11.6-slim@sha256:f7d141c1ec6af549958a7a2543365a7829c2cdc4476308ec2e182f8a7c59b519
-
-LABEL description="Development environment for bemanitools"
-
-# mingw-w64-gcc has 32-bit and 64-bit toolchains
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    mingw-w64 \
-    mingw-w64-common \
-    make \
-    zip \
-    git \
-    clang-format \
-    python3-pip \
- && rm -rf /var/lib/apt/lists/*
-
-RUN pip3 install mdformat
-
-RUN mkdir /bemanitools
-WORKDIR /bemanitools
-
-ENV SHELL /bin/bash

GNUmakefile

@@ -13,10 +13,8 @@ BUILDDIR        ?= build
 
 builddir_docker 	  := $(BUILDDIR)/docker
 
-docker_build_container_name := "bemanitools-build"
-docker_build_image_name     := "bemanitools-build:latest"
-docker_dev_container_name := "bemanitools-dev"
-docker_dev_image_name     := "bemanitools-dev:latest"
+docker_container_name := "bemanitools-build"
+docker_image_name     := "bemanitools-build:latest"
 
 depdir                := $(BUILDDIR)/dep
 objdir                := $(BUILDDIR)/obj
@@ -43,7 +41,6 @@ FORCE:
 
 .PHONY: \
 build-docker \
-dev-docker \
 clean \
 code-format \
 doc-format \
@@ -92,38 +89,21 @@ version:
 	$(V)echo "$(gitrev)" > version
 
 build-docker:
-	$(V)docker rm -f $(docker_build_container_name) 2> /dev/null || true
+	$(V)docker rm -f $(docker_container_name) 2> /dev/null || true
 	$(V)docker \
 		build \
-		-t $(docker_build_image_name) \
-		-f Dockerfile.build \
+		-t $(docker_image_name) \
+		-f Dockerfile \
 		.
 	$(V)docker \
 		run \
 		--volume $(shell pwd):/bemanitools \
-		--name $(docker_build_container_name) \
-		$(docker_build_image_name)
-
-dev-docker:
-	$(V)docker rm -f $(docker_dev_container_name) 2> /dev/null || true
-	$(V)docker \
-		build \
-		-t $(docker_dev_image_name) \
-		-f Dockerfile.dev \
-		.
-	$(V)docker \
-		run \
-		--interactive \
-		--tty \
-		--volume $(shell pwd):/bemanitools \
-		--name $(docker_dev_container_name) \
-		$(docker_dev_image_name)
+		--name $(docker_container_name) \
+		$(docker_image_name)
 
 clean-docker:
-	$(V)docker rm -f $(docker_dev_container_name) || true
-	$(V)docker image rm -f $(docker_dev_image_name) || true
-	$(V)docker rm -f $(docker_build_container_name) || true
-	$(V)docker image rm -f $(docker_build_image_name) || true
+	$(V)docker rm -f $(docker_container_name) || true
+	$(V)docker image rm -f $(docker_image_name) || true
 	$(V)rm -rf $(BUILDDIR)
 
 #

Module.mk

@@ -100,7 +100,8 @@ include src/main/bstio/Module.mk
 include src/main/camhook/Module.mk
 include src/main/cconfig/Module.mk
 include src/main/config/Module.mk
-include src/main/core/Module.mk
+include src/main/d3d9-frame-graph-hook/Module.mk
+include src/main/d3d9-monitor-check/Module.mk
 include src/main/d3d9-util/Module.mk
 include src/main/d3d9exhook/Module.mk
 include src/main/ddrhook-util/Module.mk
@@ -233,6 +234,9 @@ $(zipdir)/tools.zip: \
 		build/bin/indep-32/ezusb2-dbg-hook.dll \
 		build/bin/indep-32/ezusb2-tool.exe \
 		build/bin/indep-32/ezusb-tool.exe \
+		build/bin/indep-32/nvgpu.exe \
+		build/bin/indep-32/d3d9-frame-graph-hook.dll \
+		build/bin/indep-32/d3d9-monitor-check.exe \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -247,6 +251,9 @@ $(zipdir)/tools-x64.zip: \
 		build/bin/indep-64/iidx-ezusb2-exit-hook.dll \
 		build/bin/indep-64/jbiotest.exe \
 		build/bin/indep-64/mempatch-hook.dll \
+		build/bin/indep-64/nvgpu.exe \
+		build/bin/indep-64/d3d9-frame-graph-hook.dll \
+		build/bin/indep-64/d3d9-monitor-check.exe \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -325,10 +332,6 @@ $(zipdir)/iidx-18.zip: \
 		dist/iidx/config.bat \
 		dist/iidx/gamestart-18.bat \
 		dist/iidx/iidxhook-18.conf \
-		dist/iidx/launcher-18.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		dist/iidx/vefx.txt \
 		| $(zipdir)/
 	$(V)echo ... $@
@@ -360,10 +363,6 @@ $(zipdir)/iidx-19.zip: \
 		dist/iidx/config.bat \
 		dist/iidx/gamestart-19.bat \
 		dist/iidx/iidxhook-19.conf \
-		dist/iidx/launcher-19.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		dist/iidx/vefx.txt \
 		| $(zipdir)/
 	$(V)echo ... $@
@@ -380,10 +379,6 @@ $(zipdir)/iidx-20.zip: \
 		dist/iidx/config.bat \
 		dist/iidx/gamestart-20.bat \
 		dist/iidx/iidxhook-20.conf \
-		dist/iidx/launcher-20.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		dist/iidx/vefx.txt \
 		| $(zipdir)/
 	$(V)echo ... $@
@@ -421,13 +416,6 @@ $(zipdir)/iidx-21-to-24.zip: \
 		dist/iidx/iidxhook-22.conf \
 		dist/iidx/iidxhook-23.conf \
 		dist/iidx/iidxhook-24.conf \
-		dist/iidx/launcher-21.xml \
-		dist/iidx/launcher-22.xml \
-		dist/iidx/launcher-23.xml \
-		dist/iidx/launcher-24.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		dist/iidx/vefx.txt \
 		| $(zipdir)/
 	$(V)echo ... $@
@@ -446,11 +434,6 @@ $(zipdir)/iidx-25-to-26.zip: \
 		dist/iidx/gamestart-26.bat \
 		dist/iidx/iidxhook-25.conf \
 		dist/iidx/iidxhook-26.conf \
-		dist/iidx/launcher-25.xml \
-		dist/iidx/launcher-26.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		dist/iidx/vefx.txt \
 		| $(zipdir)/
 	$(V)echo ... $@
@@ -473,13 +456,6 @@ $(zipdir)/iidx-27-to-30.zip: \
 		dist/iidx/iidxhook-28.conf \
 		dist/iidx/iidxhook-29.conf \
 		dist/iidx/iidxhook-30.conf \
-		dist/iidx/launcher-27.xml \
-		dist/iidx/launcher-28.xml \
-		dist/iidx/launcher-29.xml \
-		dist/iidx/launcher-30.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		dist/iidx/vefx.txt \
 		| $(zipdir)/
 	$(V)echo ... $@
@@ -548,10 +524,6 @@ $(zipdir)/jb-03.zip: \
 		build/bin/indep-32/jbio.dll \
 		dist/jb/config.bat \
 		dist/jb/gamestart-03.bat \
-		dist/jb/launcher-03.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -565,10 +537,6 @@ $(zipdir)/jb-04.zip: \
 		build/bin/indep-32/jbio.dll \
 		dist/jb/config.bat \
 		dist/jb/gamestart-03.bat \
-		dist/jb/launcher-03.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -582,10 +550,6 @@ $(zipdir)/jb-05-to-07.zip: \
 		build/bin/indep-32/jbio.dll \
 		dist/jb/config.bat \
 		dist/jb/gamestart-04.bat \
-		dist/jb/launcher-04.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -599,10 +563,6 @@ $(zipdir)/jb-08.zip: \
 		build/bin/indep-32/jbio.dll \
 		dist/jb/config.bat \
 		dist/jb/gamestart-04.bat \
-		dist/jb/launcher-04.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -627,10 +587,6 @@ $(zipdir)/sdvx-01-to-04.zip: \
 		build/bin/indep-32/sdvxio.dll \
 		dist/sdvx/config.bat \
 		dist/sdvx/gamestart.bat \
-		dist/sdvx/launcher.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -645,10 +601,6 @@ $(zipdir)/sdvx-05-to-06.zip: \
 		dist/sdvx5/config.bat \
 		dist/sdvx5/gamestart.bat \
 		dist/sdvx5/sdvxhook2.conf \
-		dist/sdvx5/launcher.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -663,10 +615,6 @@ $(zipdir)/sdvx-05-cn.zip: \
 		dist/sdvx5/config.bat \
 		dist/sdvx5/gamestart-cn.bat \
 		dist/sdvx5/sdvxhook2-cn.conf \
-		dist/sdvx5/launcher-cn.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -741,10 +689,6 @@ $(zipdir)/ddr-12.zip: \
 		build/bin/indep-32/geninput.dll \
 		dist/ddr/config.bat \
 		dist/ddr/gamestart-12.bat \
-		dist/ddr/launcher-12.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -761,10 +705,6 @@ $(zipdir)/ddr-13.zip: \
 		build/bin/indep-32/geninput.dll \
 		dist/ddr/config.bat \
 		dist/ddr/gamestart-13.bat \
-		dist/ddr/launcher-13.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -778,21 +718,11 @@ $(zipdir)/ddr-14-to-18.zip: \
 		build/bin/indep-32/eamio.dll \
 		build/bin/indep-32/geninput.dll \
 		dist/ddr/config.bat \
-		dist/ddr/gamestart-17.bat \
-		dist/ddr/gamestart-18.bat \
 		dist/ddr/gamestart-14.bat \
 		dist/ddr/gamestart-15.bat \
 		dist/ddr/gamestart-16.bat \
 		dist/ddr/gamestart-17.bat \
 		dist/ddr/gamestart-18.bat \
-		dist/ddr/launcher-14.xml \
-		dist/ddr/launcher-15.xml \
-		dist/ddr/launcher-16.xml \
-		dist/ddr/launcher-17.xml \
-		dist/ddr/launcher-18.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -806,17 +736,9 @@ $(zipdir)/ddr-16-to-18-x64.zip: \
 		build/bin/indep-64/eamio.dll \
 		build/bin/indep-64/geninput.dll \
 		dist/ddr/config.bat \
-		dist/ddr/gamestart-17.bat \
-		dist/ddr/gamestart-18.bat \
 		dist/ddr/gamestart-16.bat \
 		dist/ddr/gamestart-17.bat \
 		dist/ddr/gamestart-18.bat \
-		dist/ddr/launcher-16.xml \
-		dist/ddr/launcher-17.xml \
-		dist/ddr/launcher-18.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^
@@ -855,11 +777,6 @@ $(zipdir)/bst.zip: \
 		dist/bst/config.bat \
 		dist/bst/gamestart1.bat \
 		dist/bst/gamestart2.bat \
-		dist/bst/launcher-01.xml \
-		dist/bst/launcher-02.xml \
-		dist/shared/ea3-ident.xml \
-		dist/shared/ea3-license.xml \
-		dist/shared/ea3-service.xml \
 		| $(zipdir)/
 	$(V)echo ... $@
 	$(V)zip -j $@ $^

README.md

@@ -119,6 +119,8 @@ The following games are supported with their corresponding hook-libraries.
   - [extiotest](doc/tools/extiotest.md)
 - [aciotest](doc/tools/aciotest.md): Command line tool to quickly test ACIO devices
 - config: UI input/output configuration tool when using the default bemanitools API (geninput)
+- [d3d9-monitor-check](doc/tools/d3d9-monitor-check.md): Command line tool to check the monitor refresh rate of the
+  current GPU + monitor configuration
 - ir-beat-patch-9/10: Patch the IR beat phase on IIDX 9 and 10
 - [mempatch-hook](doc/tools/mempatch-hook.md): Patch raw memory locations in the target process
   based on the provided configuration

dist/bst/gamestart1.bat

@@ -1,34 +1,10 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
+if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
+if not exist dev\raw mkdir dev\raw
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-01.xml %*
+launcher -K bsthook.dll -E prop/ea3-config-1.xml beatstream1.dll %*

dist/bst/gamestart2.bat

@@ -1,34 +1,10 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
+if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
+if not exist dev\raw mkdir dev\raw
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-02.xml %*
+launcher -K bsthook.dll -E prop/ea3-config-2.xml beatstream2.dll %*

dist/bst/launcher-01.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config-1.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">16777216</heap_avs>
-                    <heap_std __type="u32">16777216</heap_std>
-                </boot>∂
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>beatstream1.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-server.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">bsthook.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/bst/launcher-02.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config-2.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">16777216</heap_avs>
-                    <heap_std __type="u32">16777216</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>beatstream2.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">bsthook.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/ddr/gamestart-12.bat

@@ -1,42 +1,11 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set COM_DIR=%CONTENT_DIR%\com
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist conf\nvram mkdir conf\nvram
+if not exist conf\raw mkdir conf\raw
 
-:: Register video codecs, e.g. required for background videos
-regsvr32 /s %COM_DIR%\k-clvsd.dll
+regsvr32 /s k-clvsd.dll
+regsvr32 /s xactengine2_10.dll
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-13.xml %*
-
-:: Unregister video codec to avoid conflicts with other/older video codecs crashing different
-:: game versions, e.g. DDR X
-regsvr32 /u /s %COM_DIR%\k-clvsd.dll
+.\launcher.exe -K .\ddrhook2.dll .\ddr.dll %*

dist/ddr/gamestart-13.bat

@@ -1,42 +1,11 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set COM_DIR=%CONTENT_DIR%\com
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist conf\nvram mkdir conf\nvram
+if not exist conf\raw mkdir conf\raw
 
-:: Register video codecs, e.g. required for background videos
-regsvr32 /s %COM_DIR%\k-clvsd.dll
+regsvr32 /s k-clvsd.dll
+regsvr32 /s xactengine2_10.dll
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-13.xml %*
-
-:: Unregister video codec to avoid conflicts with other/older video codecs crashing different
-:: game versions, e.g. DDR X
-regsvr32 /u /s %COM_DIR%\k-clvsd.dll
+.\launcher.exe -K .\ddrhook2.dll .\ddr.dll %*

dist/ddr/gamestart-14.bat

@@ -1,44 +1,14 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set COM_DIR=%CONTENT_DIR%\com
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist conf\nvram mkdir conf\nvram
+if not exist conf\nvram\coin.xml copy prop\coin.xml conf\nvram\coin.xml
+if not exist conf\nvram\eacoin.xml copy prop\eacoin.xml conf\nvram\eacoin.xml
+if not exist conf\nvram\share-config.xml copy prop\share-config.xml conf\nvram\share-config.xml
+if not exist conf\raw mkdir conf\raw
 
-:: Register video codecs, e.g. required for background videos
-regsvr32 /s %COM_DIR%\k-clvsd.dll
-regsvr32 /s %COM_DIR%\xactengine2_10.dll
+regsvr32 /s k-clvsd.dll
+regsvr32 /s xactengine2_10.dll
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-14.xml %*
-
-:: Unregister video codec to avoid conflicts with other/older video codecs crashing different
-:: game versions, e.g. DDR X
-regsvr32 /u /s %COM_DIR%\k-clvsd.dll
-regsvr32 /u /s %COM_DIR%\xactengine2_10.dll
+.\launcher.exe -K .\ddrhook2.dll .\mdxja_945.dll %*

dist/ddr/gamestart-15.bat

@@ -1,44 +1,14 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set COM_DIR=%CONTENT_DIR%\com
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist conf\nvram mkdir conf\nvram
+if not exist conf\nvram\coin.xml copy prop\coin.xml conf\nvram\coin.xml
+if not exist conf\nvram\eacoin.xml copy prop\eacoin.xml conf\nvram\eacoin.xml
+if not exist conf\nvram\share-config.xml copy prop\share-config.xml conf\nvram\share-config.xml
+if not exist conf\raw mkdir conf\raw
 
-:: Register video codecs, e.g. required for background videos
-regsvr32 /s %COM_DIR%\k-clvsd.dll
-regsvr32 /s %COM_DIR%\xactengine2_10.dll
+regsvr32 /s k-clvsd.dll
+regsvr32 /s xactengine2_10.dll
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-15.xml %*
-
-:: Unregister video codec to avoid conflicts with other/older video codecs crashing different
-:: game versions, e.g. DDR X
-regsvr32 /u /s %COM_DIR%\k-clvsd.dll
-regsvr32 /u /s %COM_DIR%\xactengine2_10.dll
+.\launcher.exe -K .\ddrhook2.dll .\mdxja_945.dll %*

dist/ddr/gamestart-16.bat

@@ -1,44 +1,15 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set COM_DIR=%CONTENT_DIR%\com
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist conf\nvram mkdir conf\nvram
+if not exist conf\nvram\ea3-config.xml copy prop\eamuse-config.xml conf\nvram\ea3-config.xml
+if not exist conf\nvram\coin.xml copy prop\coin.xml conf\nvram\coin.xml
+if not exist conf\nvram\eacoin.xml copy prop\eacoin.xml conf\nvram\eacoin.xml
+if not exist conf\nvram\testmode-v.xml copy prop\testmode-v.xml conf\nvram\testmode-v.xml
+if not exist conf\raw mkdir conf\raw
 
-:: Register video codecs, e.g. required for background videos
-regsvr32 /s %COM_DIR%\k-clvsd.dll
-regsvr32 /s %COM_DIR%\xactengine2_10.dll
+regsvr32 /s com\k-clvsd.dll
+regsvr32 /s com\xactengine2_10.dll
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-17.xml %*
-
-:: Unregister video codec to avoid conflicts with other/older video codecs crashing different
-:: game versions, e.g. DDR X
-regsvr32 /u /s %COM_DIR%\k-clvsd.dll
-regsvr32 /u /s %COM_DIR%\xactengine2_10.dll
+.\launcher.exe -H 33554432 -K .\ddrhook2.dll .\arkmdxp3.dll %*

dist/ddr/gamestart-17.bat

@@ -1,44 +1,15 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set COM_DIR=%CONTENT_DIR%\com
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist conf\nvram mkdir conf\nvram
+if not exist conf\nvram\ea3-config.xml copy prop\eamuse-config.xml conf\nvram\ea3-config.xml
+if not exist conf\nvram\coin.xml copy prop\coin.xml conf\nvram\coin.xml
+if not exist conf\nvram\eacoin.xml copy prop\eacoin.xml conf\nvram\eacoin.xml
+if not exist conf\nvram\testmode-v.xml copy prop\testmode-v.xml conf\nvram\testmode-v.xml
+if not exist conf\raw mkdir conf\raw
 
-:: Register video codecs, e.g. required for background videos
-regsvr32 /s %COM_DIR%\k-clvsd.dll
-regsvr32 /s %COM_DIR%\xactengine2_10.dll
+regsvr32 /s com\k-clvsd.dll
+regsvr32 /s com\xactengine2_10.dll
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-17.xml %*
-
-:: Unregister video codec to avoid conflicts with other/older video codecs crashing different
-:: game versions, e.g. DDR X
-regsvr32 /u /s %COM_DIR%\k-clvsd.dll
-regsvr32 /u /s %COM_DIR%\xactengine2_10.dll
+.\launcher.exe -H 33554432 -K .\ddrhook2.dll .\arkmdxp3.dll %*

dist/ddr/gamestart-18.bat

@@ -1,44 +1,15 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set COM_DIR=%CONTENT_DIR%\com
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist conf\nvram mkdir conf\nvram
+if not exist conf\nvram\ea3-config.xml copy prop\eamuse-config.xml conf\nvram\ea3-config.xml
+if not exist conf\nvram\coin.xml copy prop\coin.xml conf\nvram\coin.xml
+if not exist conf\nvram\eacoin.xml copy prop\eacoin.xml conf\nvram\eacoin.xml
+if not exist conf\nvram\testmode-v.xml copy prop\testmode-v.xml conf\nvram\testmode-v.xml
+if not exist conf\raw mkdir conf\raw
 
-:: Register video codecs, e.g. required for background videos
-regsvr32 /s %COM_DIR%\k-clvsd.dll
-regsvr32 /s %COM_DIR%\xactengine2_10.dll
+regsvr32 /s com\k-clvsd.dll
+regsvr32 /s com\xactengine2_10.dll
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-18.xml %*
-
-:: Unregister video codec to avoid conflicts with other/older video codecs crashing different
-:: game versions, e.g. DDR X
-regsvr32 /u /s %COM_DIR%\k-clvsd.dll
-regsvr32 /u /s %COM_DIR%\xactengine2_10.dll
+.\launcher.exe -H 33554432 -K .\ddrhook2.dll .\arkmdxp3.dll %*

dist/ddr/launcher-12.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">31457280</heap_avs>
-                    <heap_std __type="u32">31457280</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>ddr.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">ddrhook2.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/ddr/launcher-13.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">31457280</heap_avs>
-                    <heap_std __type="u32">31457280</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>ddr.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">ddrhook2.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/ddr/launcher-14.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">31457280</heap_avs>
-                    <heap_std __type="u32">31457280</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>mdxja_945.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">ddrhook2.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/ddr/launcher-15.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">31457280</heap_avs>
-                    <heap_std __type="u32">31457280</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>mdxja_945.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">ddrhook2.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/ddr/launcher-16.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                    <file dst="/dev/nvram/testmode-v.xml" src="/prop/testmode-v.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">33554432</heap_avs>
-                    <heap_std __type="u32">1048576</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>arkmdxp3.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">ddrhook2.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/ddr/launcher-17.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                    <file dst="/dev/nvram/testmode-v.xml" src="/prop/testmode-v.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">33554432</heap_avs>
-                    <heap_std __type="u32">1048576</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>arkmdxp3.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">ddrhook2.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/ddr/launcher-18.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                    <file dst="/dev/nvram/testmode-v.xml" src="/prop/testmode-v.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">33554432</heap_avs>
-                    <heap_std __type="u32">1048576</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>arkmdxp3.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">ddrhook2.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/ea3-ident.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3_conf>
-    <soft>
-        <model __type="str">LDJ</model>
-        <dest __type="str">J</dest>
-        <spec __type="str">A</spec>
-        <rev __type="str">A</rev>
-        <ext __type="str">2022082400</ext>
-    </soft>
-</ea3_conf>

dist/iidx/eamuse-server.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3>
-    <network>
-        <services>http://localhost</services>
-    </network>
-</ea3>

dist/iidx/gamestart-18.bat

@@ -1,34 +1,14 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist d mkdir d
+if not exist e mkdir e
+if not exist f mkdir f
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
+if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
+if not exist dev\raw mkdir dev\raw
 
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-18.xml --config %BEMANITOOLS_DIR%\iidxhook-18.conf %*
+launcher -K iidxhook4.dll bm2dx.dll --config iidxhook-18.conf %*

dist/iidx/gamestart-19.bat

@@ -1,34 +1,14 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist d mkdir d
+if not exist e mkdir e
+if not exist f mkdir f
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
+if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
+if not exist dev\raw mkdir dev\raw
 
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-19.xml --config %BEMANITOOLS_DIR%\iidxhook-19.conf %*
+launcher -K iidxhook5.dll bm2dx.dll --config iidxhook-19.conf %*

dist/iidx/gamestart-20.bat

@@ -1,34 +1,10 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
+if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
+if not exist dev\raw mkdir dev\raw
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-20.xml --config %BEMANITOOLS_DIR%\iidxhook-20.conf %*
+launcher -K iidxhook6.dll bm2dx.dll --config iidxhook-20.conf %*

dist/iidx/gamestart-21.bat

@@ -1,34 +1,10 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
+if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
+if not exist dev\raw mkdir dev\raw
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-21.xml --config %BEMANITOOLS_DIR%\iidxhook-21.conf %*
+launcher -K iidxhook7.dll bm2dx.dll --config iidxhook-21.conf %*

dist/iidx/gamestart-22.bat

@@ -1,34 +1,10 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
+if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
+if not exist dev\raw mkdir dev\raw
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-22.xml --config %BEMANITOOLS_DIR%\iidxhook-22.conf %*
+launcher -K iidxhook7.dll bm2dx.dll --config iidxhook-22.conf %*

dist/iidx/gamestart-23.bat

@@ -1,34 +1,10 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
+if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
+if not exist dev\raw mkdir dev\raw
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-23.xml --config %BEMANITOOLS_DIR%\iidxhook-23.conf %*
+launcher -K iidxhook7.dll bm2dx.dll --config iidxhook-23.conf %*

dist/iidx/gamestart-24.bat

@@ -1,34 +1,10 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
+if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
+if not exist dev\raw mkdir dev\raw
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-24.xml --config %BEMANITOOLS_DIR%\iidxhook-24.conf %*
+launcher -K iidxhook7.dll bm2dx.dll --config iidxhook-24.conf %*

dist/iidx/gamestart-25.bat

@@ -1,34 +1,16 @@
 @echo off
-
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev mkdir dev
+if not exist dev\e mkdir dev\e
+if not exist dev\g mkdir dev\g
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\raw mkdir dev\raw
+if not exist dev\raw\log mkdir dev\raw\log
+if not exist dev\raw\fscache mkdir dev\raw\fscache
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
+for /R prop\defaults %%D in (*.*) do (
+    if not exist dev\nvram\%%~nxD copy /y prop\defaults\%%~nxD dev\nvram
+)
 
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-25.xml --config %BEMANITOOLS_DIR%\iidxhook-25.conf %*
+launcher -H 134217728 -K iidxhook8.dll bm2dx.dll --config iidxhook-25.conf %*

dist/iidx/gamestart-26.bat

@@ -1,34 +1,16 @@
 @echo off
-
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev mkdir dev
+if not exist dev\e mkdir dev\e
+if not exist dev\g mkdir dev\g
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\raw mkdir dev\raw
+if not exist dev\raw\log mkdir dev\raw\log
+if not exist dev\raw\fscache mkdir dev\raw\fscache
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
+for /R prop\defaults %%D in (*.*) do (
+    if not exist dev\nvram\%%~nxD copy /y prop\defaults\%%~nxD dev\nvram
+)
 
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-26.xml --config %BEMANITOOLS_DIR%\iidxhook-26.conf %*
+launcher -H 134217728 -K iidxhook8.dll bm2dx.dll --config iidxhook-26.conf %*

dist/iidx/gamestart-27.bat

@@ -1,34 +1,16 @@
 @echo off
-
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev mkdir dev
+if not exist dev\e mkdir dev\e
+if not exist dev\g mkdir dev\g
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\raw mkdir dev\raw
+if not exist dev\raw\log mkdir dev\raw\log
+if not exist dev\raw\fscache mkdir dev\raw\fscache
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
+for /R prop\defaults %%D in (*.*) do (
+    if not exist dev\nvram\%%~nxD copy /y prop\defaults\%%~nxD dev\nvram
+)
 
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-27.xml --config %BEMANITOOLS_DIR%\iidxhook-27.conf %*
+launcher -H 134217728 -B iidxhook9.dll bm2dx.dll --config iidxhook-27.conf %*

dist/iidx/gamestart-28.bat

@@ -1,34 +1,16 @@
 @echo off
-
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev mkdir dev
+if not exist dev\e mkdir dev\e
+if not exist dev\g mkdir dev\g
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\raw mkdir dev\raw
+if not exist dev\raw\log mkdir dev\raw\log
+if not exist dev\raw\fscache mkdir dev\raw\fscache
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
+for /R prop\defaults %%D in (*.*) do (
+    if not exist dev\nvram\%%~nxD copy /y prop\defaults\%%~nxD dev\nvram
+)
 
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-28.xml --config %BEMANITOOLS_DIR%\iidxhook-28.conf %*
+launcher -H 134217728 -B iidxhook9.dll bm2dx.dll --config iidxhook-28.conf %*

dist/iidx/gamestart-29.bat

@@ -1,34 +1,16 @@
 @echo off
-
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev mkdir dev
+if not exist dev\e mkdir dev\e
+if not exist dev\g mkdir dev\g
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\raw mkdir dev\raw
+if not exist dev\raw\log mkdir dev\raw\log
+if not exist dev\raw\fscache mkdir dev\raw\fscache
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
+for /R prop\defaults %%D in (*.*) do (
+    if not exist dev\nvram\%%~nxD copy /y prop\defaults\%%~nxD dev\nvram
+)
 
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-29.xml --config %BEMANITOOLS_DIR%\iidxhook-29.conf %*
+launcher -H 134217728 -B iidxhook9.dll bm2dx.dll --config iidxhook-29.conf %*

dist/iidx/gamestart-30.bat

@@ -1,34 +1,16 @@
 @echo off
-
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev mkdir dev
+if not exist dev\e mkdir dev\e
+if not exist dev\g mkdir dev\g
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\raw mkdir dev\raw
+if not exist dev\raw\log mkdir dev\raw\log
+if not exist dev\raw\fscache mkdir dev\raw\fscache
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
+for /R prop\defaults %%D in (*.*) do (
+    if not exist dev\nvram\%%~nxD copy /y prop\defaults\%%~nxD dev\nvram
+)
 
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-30.xml --config %BEMANITOOLS_DIR%\iidxhook-30.conf %*
+modules\launcher -H 134217728 -B iidxhook9.dll bm2dx.dll --config iidxhook-30.conf %*

dist/iidx/launcher-18.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">16777216</heap_avs>
-                    <heap_std __type="u32">16777216</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">iidxhook4.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-19.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">16777216</heap_avs>
-                    <heap_std __type="u32">16777216</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">iidxhook5.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-20.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">16777216</heap_avs>
-                    <heap_std __type="u32">16777216</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">iidxhook6.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-21.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">16777216</heap_avs>
-                    <heap_std __type="u32">16777216</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">iidxhook7.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-22.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">16777216</heap_avs>
-                    <heap_std __type="u32">16777216</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">iidxhook7.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-23.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">16777216</heap_avs>
-                    <heap_std __type="u32">16777216</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">iidxhook7.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-24.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">16777216</heap_avs>
-                    <heap_std __type="u32">16777216</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">iidxhook7.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-25.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">134217728</heap_avs>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">iidxhook8.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-26.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">134217728</heap_avs>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">iidxhook8.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-27.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">134217728</heap_avs>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <mounttable_selector __type="str">boot</mounttable_selector>
-                <mounttable>
-                    <vfs name="boot" fstype="fs" src="dev/raw" dst="/dev/raw" opt=""/>
-                    <vfs name="boot" fstype="fs" src="dev/nvram" dst="/dev/nvram" opt=""/>
-                </mounttable>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-    </hook_dlls>
-    <before_hook_dlls>
-      <dll __type="str">iidxhook9.dll</dll>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-28.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">134217728</heap_avs>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <mounttable_selector __type="str">boot</mounttable_selector>
-                <mounttable>
-                    <vfs name="boot" fstype="fs" src="dev/raw" dst="/dev/raw" opt=""/>
-                    <vfs name="boot" fstype="fs" src="dev/nvram" dst="/dev/nvram" opt=""/>
-                </mounttable>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-    </hook_dlls>
-    <before_hook_dlls>
-      <dll __type="str">iidxhook9.dll</dll>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-29.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">134217728</heap_avs>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <mounttable_selector __type="str">boot</mounttable_selector>
-                <mounttable>
-                    <vfs name="boot" fstype="fs" src="dev/raw" dst="/dev/raw" opt=""/>
-                    <vfs name="boot" fstype="fs" src="dev/nvram" dst="/dev/nvram" opt=""/>
-                </mounttable>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-    </hook_dlls>
-    <before_hook_dlls>
-      <dll __type="str">iidxhook9.dll</dll>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/launcher-30.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">134217728</heap_avs>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>bm2dx.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <mounttable_selector __type="str">boot</mounttable_selector>
-                <mounttable>
-                    <vfs name="boot" fstype="fs" src="dev/raw" dst="/dev/raw" opt=""/>
-                    <vfs name="boot" fstype="fs" src="dev/nvram" dst="/dev/nvram" opt=""/>
-                </mounttable>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-    </hook_dlls>
-    <before_hook_dlls>
-      <dll __type="str">iidxhook9.dll</dll>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/iidx/pcbid.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3_conf>
-    <id>
-        <softid __type="str">0101020304050607083F</softid>
-        <pcbid __type="str">0101020304050607083F</pcbid>
-    </id>
-</ea3_conf>

dist/jb/ea3-ident.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3_conf>
-    <soft>
-        <model __type="str">LDJ</model>
-        <dest __type="str">J</dest>
-        <spec __type="str">A</spec>
-        <rev __type="str">A</rev>
-        <ext __type="str">2022082400</ext>
-    </soft>
-</ea3_conf>

dist/jb/eamuse-server.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3>
-    <network>
-        <services>http://localhost</services>
-    </network>
-</ea3>

dist/jb/gamestart-03.bat

@@ -1,34 +1,11 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\nvram\ea3-config.xml copy prop\ea3-config.xml dev\nvram\ea3-config.xml
+if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
+if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
+if not exist dev\raw mkdir dev\raw
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-03.xml -v %*
+launcher -H 33554432 -K jbhook2.dll jubeat.dll -v

dist/jb/gamestart-04.bat

@@ -1,34 +1,11 @@
 @echo off
 
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\nvram\ea3-config.xml copy prop\ea3-config.xml dev\nvram\ea3-config.xml
+if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
+if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
+if not exist dev\raw mkdir dev\raw
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-04.xml %*
+launcher -H 33554432 -K jbhook3.dll jubeat.dll

dist/jb/launcher-03.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">33554432</heap_avs>
-                    <heap_std __type="u32">33554432</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>jubeat.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">jbhook2.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/jb/launcher-04.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">33554432</heap_avs>
-                    <heap_std __type="u32">33554432</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>jubeat.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">jbhook3.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/jb/pcbid.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3_conf>
-    <id>
-        <softid __type="str">0101020304050607083F</softid>
-        <pcbid __type="str">0101020304050607083F</pcbid>
-    </id>
-</ea3_conf>

dist/sdvx/ea3-ident.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3_conf>
-    <soft>
-        <model __type="str">LDJ</model>
-        <dest __type="str">J</dest>
-        <spec __type="str">A</spec>
-        <rev __type="str">A</rev>
-        <ext __type="str">2022082400</ext>
-    </soft>
-</ea3_conf>

dist/sdvx/eamuse-server.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3>
-    <network>
-        <services>http://localhost</services>
-    </network>
-</ea3>

dist/sdvx/gamestart.bat

@@ -8,38 +8,3 @@ if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin
 if not exist dev\raw mkdir dev\raw
 
 launcher -K sdvxhook.dll soundvoltex.dll %*
-
-@echo off
-
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
-cd /d %~dp0
-
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
-
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
-
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher.xml %*

dist/sdvx/launcher.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">16777216</heap_avs>
-                    <heap_std __type="u32">16777216</heap_std>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>soundvoltex.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">sdvxhook.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/sdvx/pcbid.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3_conf>
-    <id>
-        <softid __type="str">0101020304050607083F</softid>
-        <pcbid __type="str">0101020304050607083F</pcbid>
-    </id>
-</ea3_conf>

dist/sdvx5/ea3-ident.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3_conf>
-    <soft>
-        <model __type="str">LDJ</model>
-        <dest __type="str">J</dest>
-        <spec __type="str">A</spec>
-        <rev __type="str">A</rev>
-        <ext __type="str">2022082400</ext>
-    </soft>
-</ea3_conf>

dist/sdvx5/eamuse-server.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3>
-    <network>
-        <services>http://localhost</services>
-    </network>
-</ea3>

dist/sdvx5/gamestart-cn.bat

@@ -1,34 +1,17 @@
 @echo off
-
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev mkdir dev
+if not exist dev\e mkdir dev\e
+if not exist dev\g mkdir dev\g
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\raw mkdir dev\raw
+if not exist dev\raw\c.dest echo $null >> dev\raw\c.dest
+if not exist dev\raw\log mkdir dev\raw\log
+if not exist dev\raw\fscache mkdir dev\raw\fscache
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
+for /R prop\defaults %%D in (*.*) do (
+    if not exist dev\nvram\%%~nxD copy /y prop\defaults\%%~nxD dev\nvram
+)
 
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-cn.xml --config %BEMANITOOLS_DIR%\sdvxhook2-cn.conf %*
+launcher -H 268435456 -K sdvxhook2-cn.dll soundvoltex.dll --config sdvxhook2-cn.conf %*

dist/sdvx5/gamestart.bat

@@ -1,34 +1,16 @@
 @echo off
-
-:: Game doesn't work properly when not run with administrator privileges
->nul 2>&1 net session
-
-if %errorlevel% neq 0 (
-    echo This script requires administrative privileges.
-    echo Please run the script as an administrator.
-    pause
-    exit 1
-)
-
-:: Script expects to be located in a subfolder "bemanitools" in the root folder
-:: (contents/) next to the folders modules, data etc.
 cd /d %~dp0
 
-:: Script expects to be located in the root folder (contents/) next to the
-:: folders modules, data etc.
-set CONTENT_DIR=%CD%\..
-set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
-set MODULES_DIR=%CONTENT_DIR%\modules
+if not exist dev mkdir dev
+if not exist dev\e mkdir dev\e
+if not exist dev\g mkdir dev\g
+if not exist dev\nvram mkdir dev\nvram
+if not exist dev\raw mkdir dev\raw
+if not exist dev\raw\log mkdir dev\raw\log
+if not exist dev\raw\fscache mkdir dev\raw\fscache
 
-:: Keep that data vanilla, no need to copy these around anymore
-:: Just add them to the env PATH so launcher can find the libs and game executable
-:: Remark: This also requires admin privileges to propage correctly to launcher
-set PATH=^
-%MODULES_DIR%;^
-%BEMANITOOLS_DIR%;^
-%PATH%
+for /R prop\defaults %%D in (*.*) do (
+    if not exist dev\nvram\%%~nxD copy /y prop\defaults\%%~nxD dev\nvram
+)
 
-:: Current working dir is the game's root folder
-cd /d %CONTENT_DIR%
-
-%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher.xml --config %BEMANITOOLS_DIR%\sdvxhook2.conf %*
+launcher -H 268435456 -K sdvxhook2.dll soundvoltex.dll --config sdvxhook2.conf %*

dist/sdvx5/launcher-cn.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">268435456</heap_avs>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>soundvoltex.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">sdvxhook2-cn.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/sdvx5/launcher.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<launcher version="1">
-  <bootstrap>
-    <selector __type="str">bemanitools_local_fs</selector>
-    <config kind="inline">
-      <config>
-        <startup>
-            <bemanitools_local_fs>
-                <default>
-                    <file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config.xml" />
-                    <file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
-                    <file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
-                </default>
-                <boot>
-                    <file>prop/avs-config.xml</file>
-                    <heap_avs __type="u32">268435456</heap_avs>
-                </boot>
-                <log>
-                    <level>info</level>
-                </log>
-                <eamuse>
-                    <file>/dev/nvram/ea3-config.xml</file>
-                </eamuse>
-                <component>
-                    <file>soundvoltex.dll</file>
-                    <param></param>
-                </component>
-            </bemanitools_local_fs>
-        </startup>
-      </config>
-    </config>
-  </bootstrap>
-  <ea3_ident>
-    <config kind="file">bemanitools/ea3-ident.xml</config>
-    <config kind="file">bemanitools/ea3-license.xml</config>
-  </ea3_ident>
-  <avs>
-    <config kind="inline">
-        <config>
-            <fs>
-                <root>
-                    <device __type="str">.</device>
-                </root>
-                <nvram>
-                    <device __type="str">dev/nvram</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </nvram>
-                <raw>
-                    <device __type="str">dev/raw</device>
-                    <fstype __type="str">fs</fstype>
-                    <option __type="str">vf=1,posix=1</option>
-                </raw>
-            </fs>
-        </config>
-    </config>
-  </avs>
-  <eamuse>
-    <config kind="file">bemanitools/ea3-service.xml</config>
-  </eamuse>
-  <hook>
-    <hook_dlls>
-        <dll __type="str">sdvxhook2.dll</dll>
-    </hook_dlls>
-    <before_hook_dlls>
-    </before_hook_dlls>
-    <iat_hook_dlls>
-    </iat_hook_dlls>
-  </hook>
-  <debug>
-    <remote_debugger __type="bool">0</remote_debugger>
-    <log_property_configs __type="bool">0</log_property_configs>
-  </debug>
-</launcher>

dist/sdvx5/pcbid.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3_conf>
-    <id>
-        <softid __type="str">0101020304050607083F</softid>
-        <pcbid __type="str">0101020304050607083F</pcbid>
-    </id>
-</ea3_conf>

dist/shared/ea3-ident.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3_conf>
-    <soft>
-        <!-- USER TODO: Change these accordingly to match the specifications of the game and version you are running -->
-        <model __type="str">000</model>
-        <dest __type="str">A</dest>
-        <spec __type="str">A</spec>
-        <rev __type="str">A</rev>
-        <ext __type="str">1969032100</ext>
-    </soft>
-</ea3_conf>

dist/shared/ea3-license.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3_conf>
-    <id>
-        <!-- USER TODO: Change accordingly to comply with your favorite eamuse service -->
-        <softid __type="str">0101020304050607083F</softid>
-        <pcbid __type="str">0101020304050607083F</pcbid>
-    </id>
-</ea3_conf>

dist/shared/ea3-service.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="Shift-JIS"?>
-<ea3>
-    <network>
-        <!-- USER TODO: Change to your favorite eamuse service URL -->
-        <services>http://localhost</services>
-    </network>
-</ea3>

doc/tools/d3d9-monitor-check.md

@@ -0,0 +1,27 @@
+# D3D9 Monitor Check
+
+A separate application to run the infamous IIDX “monitor check” without having to run the actual
+game. The tool can be used to test measure the current avg. monitor refresh rate or debug/check if
+that value is fluctuating for some reason.
+
+The final avg. value that is provided at the end of the test can be used as input for other tooling
+or settings (e.g. patching charts to a different refresh rate on older games with bemanitools).
+
+Simply run the tool without any arguments to get a full synopsis with usage instructions.
+
+## "Accuracy" remarks
+
+The tool has been tested on an actual cabinet with `nvgpu` setting different custom timings. The
+accuracy seems to be even higher than what IIDX’s monitor check is actually showing. For example,
+with a custom timing of 59.900 hz, this tool yields fairly accurate and stable avg. 59.902 hz.
+
+The monitor check of IIDX 29 shows results of 59.8981 hz to 59.8997 hz on screen. As these are the
+only visible values to the user, determining a specific (avg.) value that can be used as input for
+other tooling or settings (e.g. patching charts to a different refresh rate on older games with
+bemanitools) is difficult. This doesn't mean that the game's monitor checks are actually
+inaccurate or wrong. Modern games with a built-in monitor check (starting IIDX 20) are syncing up
+fine and don't need any further patching or modifications.
+
+For older games, picking a value that is not as close as possible to an accurate avg. value can
+easily lead to issues with sync. So it's recommended to use the d3d9-monitor-check tool to get the
+most accurate value.

src/api/log.h

@@ -1,31 +0,0 @@
-#ifndef BEMANITOOLS_API_THREAD_H
-#define BEMANITOOLS_API_THREAD_H
-
-#include <stdint.h>
-
-#ifdef __GNUC__
-/* Bemanitools is compiled with GCC (MinGW, specifically) as of version 5 */
-#define LOG_CHECK_FMT __attribute__((format(printf, 2, 3)))
-#else
-/* Compile it out for MSVC plebs */
-#define LOG_CHECK_FMT
-#endif
-
-/* An AVS-style logger function. Comes in four flavors: misc, info, warning,
-   and fatal, with increasing severity. Fatal loggers do not return, they
-   abort the running process after writing their message to the log.
-
-   "module" is an arbitrary short string identifying the source of the log
-   message. The name of the calling DLL is a good default choice for this
-   string, although you might want to identify a module within your DLL here
-   instead.
-
-   "fmt" is a printf-style format string. Depending on the context in which
-   your DLL is running you might end up calling a logger function exported
-   from libavs, which has its own printf implementation (including a number of
-   proprietary extensions), so don't use any overly exotic formats. */
-
-typedef void (*btapi_log_formatter_t)(const char *module, const char *fmt, ...)
-    LOG_CHECK_FMT;
-
-#endif

src/api/thread.h

@@ -1,20 +0,0 @@
-#ifndef BEMANITOOLS_API_THREAD_H
-#define BEMANITOOLS_API_THREAD_H
-
-#include <stdint.h>
-
-/* An API for spawning threads. This API is defined by libavs, although
-   Bemanitools itself may supply compatible implementations of these functions
-   to your DLL, depending on the context in which it runs.
-
-   NOTE: You may only use the logging functions from a thread where Bemanitools
-   calls you, or a thread that you create using this API. Failure to observe
-   this restriction will cause the process to crash. This is a limitation of
-   libavs itself, not Bemanitools. */
-
-typedef int (*btapi_thread_create_t)(
-    int (*proc)(void *), void *ctx, uint32_t stack_sz, unsigned int priority);
-typedef void (*btapi_thread_join_t)(int thread_id, int *result);
-typedef void (*btapi_thread_destroy_t)(int thread_id);
-
-#endif

src/imports/avs.h

@@ -220,9 +220,6 @@ void property_file_write(struct property *prop, const char *path);
 int property_set_flag(struct property *prop, int flags, int mask);
 void property_destroy(struct property *prop);
 
-avs_error property_get_error(struct property *prop);
-void property_clear_error(struct property *prop);
-
 int property_psmap_import(
     struct property *prop,
     struct property_node *root,

src/imports/import_32_0_avs.def

@@ -25,8 +25,6 @@ EXPORTS
     property_destroy
     property_file_write
     property_insert_read
-    property_clear_error
-    property_get_error
     property_mem_write
     property_read_query_memsize
     property_search

src/imports/import_32_1002_avs.def

@@ -28,8 +28,6 @@ EXPORTS
     property_destroy
     property_file_write
     property_insert_read
-    property_clear_error
-    property_get_error
     property_mem_write
     property_read_query_memsize
     property_search

src/imports/import_32_1101_avs.def

@@ -26,8 +26,6 @@ EXPORTS
     property_desc_to_buffer @246 NONAME
     property_destroy @247 NONAME
     property_insert_read @255 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @266 NONAME
     property_node_datasize @267 NONAME
     property_node_name @274 NONAME

src/imports/import_32_1304_avs.def

@@ -25,8 +25,6 @@ EXPORTS
     property_desc_to_buffer @201 NONAME
     property_destroy @264 NONAME
     property_insert_read @23 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @316 NONAME
     property_node_datasize @249 NONAME
     property_node_name @255 NONAME

src/imports/import_32_1306_avs.def

@@ -25,8 +25,6 @@ EXPORTS
     property_desc_to_buffer @201 NONAME == XC058ba50000cd
     property_destroy @264 NONAME == XC058ba500010f
     property_insert_read @23 NONAME == XC058ba5000016
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @316 NONAME == XC058ba5000143
     property_node_datasize @249 NONAME == XC058ba5000100
     property_node_name @255 NONAME == XC058ba5000106

src/imports/import_32_1403_avs.def

@@ -24,8 +24,6 @@ EXPORTS
     property_desc_to_buffer @131 NONAME
     property_destroy @130 NONAME
     property_insert_read @133 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_name @573 NONAME == 
     property_node_read @573 NONAME == 
     property_node_remove @148 NONAME

src/imports/import_32_1508_avs.def

@@ -26,8 +26,6 @@ EXPORTS
     property_desc_to_buffer @129 NONAME
     property_destroy @128 NONAME
     property_insert_read @131 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @145 NONAME
     property_node_name @150 NONAME
     property_node_read @154 NONAME == XCd229cc0000f3

src/imports/import_32_1601_avs.def

@@ -19,8 +19,6 @@ EXPORTS
     property_destroy @125 NONAME
     property_desc_to_buffer @126 NONAME
     property_insert_read @128 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_search @141 NONAME
     property_node_create @142 NONAME
     property_node_name @147 NONAME == XCnbrep7000092

src/imports/import_32_1603_avs.def

@@ -19,8 +19,6 @@ EXPORTS
     property_destroy @146 NONAME
     property_desc_to_buffer @147 NONAME
     property_insert_read @149 NONAME
-    property_clear_error @158 NONAME == XCnbrep700009d
-    property_get_error @159 NONAME == XCnbrep700009e
     property_search @162 NONAME
     property_node_create @163 NONAME
     property_node_name @168 NONAME == XCnbrep70000a7

src/imports/import_32_1700_avs.def

@@ -21,8 +21,6 @@ EXPORTS
     property_destroy @146 NONAME
     property_desc_to_buffer @147 NONAME
     property_insert_read @149 NONAME
-    property_clear_error @158 NONAME == XCgsqzn000009d
-    property_get_error @159 NONAME == XCgsqzn000009e
     property_search @162 NONAME
     property_node_create @163 NONAME
     property_node_name @168 NONAME == XCgsqzn00000a7

src/imports/import_32_803_avs.def

@@ -25,8 +25,6 @@ EXPORTS
     property_destroy
     property_file_write
     property_insert_read
-    property_clear_error
-    property_get_error
     property_mem_write
     property_read_query_memsize
     property_search

src/imports/import_64_1508_avs.def

@@ -26,8 +26,6 @@ EXPORTS
     property_desc_to_buffer @129 NONAME
     property_destroy @128 NONAME
     property_insert_read @131 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @145 NONAME
     property_node_name @150 NONAME
     property_node_read @154 NONAME == XCd229cc0000f3

src/imports/import_64_1509_avs.def

@@ -26,8 +26,6 @@ EXPORTS
     property_desc_to_buffer @129 NONAME
     property_destroy @128 NONAME
     property_insert_read @131 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_node_create @145 NONAME
     property_node_name @573 NONAME == 
     property_node_read @573 NONAME == 

src/imports/import_64_1601_avs.def

@@ -19,8 +19,6 @@ EXPORTS
     property_destroy @125 NONAME
     property_desc_to_buffer @126 NONAME
     property_insert_read @128 NONAME
-    property_clear_error @573 NONAME
-    property_get_error @573 NONAME
     property_search @141 NONAME
     property_node_create @142 NONAME
     property_node_name @147 NONAME == XCnbrep7000092

src/imports/import_64_1603_avs.def

@@ -19,14 +19,12 @@ EXPORTS
     property_destroy @146 NONAME
     property_desc_to_buffer @147 NONAME
     property_insert_read @149 NONAME
-    property_clear_error @158 NONAME == XCnbrep700009d
-    property_get_error @159 NONAME == XCnbrep700009e
     property_search @162 NONAME
     property_node_create @163 NONAME
     property_node_name @168 NONAME == XCnbrep70000a7
     property_node_remove @164 NONAME
     property_node_type @169 NONAME == XCnbrep70000a8
-    property_node_clone @165 NONAME == XCnbrep70000a4
+    property_node_clone @165 NONAME
     property_node_traversal @167 NONAME
     property_node_refdata @166 NONAME == XCnbrep70000a5
     property_node_datasize @171 NONAME == XCnbrep70000aa

src/imports/import_64_1700_avs.def

@@ -21,8 +21,6 @@ EXPORTS
     property_destroy @146 NONAME
     property_desc_to_buffer @147 NONAME
     property_insert_read @149 NONAME
-    property_clear_error @158 NONAME == XCgsqzn000009d
-    property_get_error @159 NONAME == XCgsqzn000009e
     property_search @162 NONAME
     property_node_create @163 NONAME
     property_node_name @168 NONAME == XCgsqzn00000a7

src/main/aciodrv-proc/Module.mk

@@ -1,7 +1,6 @@
 libs            += aciodrv-proc
 
 libs_aciodrv-proc     := \
-    core \
 
 src_aciodrv-proc     := \
     panb.c \

src/main/aciodrv-proc/panb.c

@@ -5,9 +5,8 @@
 #include "aciodrv/device.h"
 #include "aciodrv/panb.h"
 
-#include "core/thread.h"
-
-#include "core/log.h"
+#include "util/log.h"
+#include "util/thread.h"
 
 static int auto_poll_proc(void *auto_poll_param);
 static int auto_poll_threadid;
@@ -51,7 +50,7 @@ bool aciodrv_proc_panb_init(struct aciodrv_device_ctx *device)
     InitializeCriticalSection(&keypair_lock);
     InitializeCriticalSection(&auto_poll_stop_lock);
     auto_poll_threadid =
-        core_thread_create(auto_poll_proc, (void *) device, 0x4000, 0);
+        thread_create(auto_poll_proc, (void *) device, 0x4000, 0);
 
     return true;
 }
@@ -81,8 +80,8 @@ void aciodrv_proc_panb_fini(struct aciodrv_device_ctx *device)
     auto_poll_stop = true;
     LeaveCriticalSection(&auto_poll_stop_lock);
 
-    core_thread_join(auto_poll_threadid, NULL);
-    core_thread_destroy(auto_poll_threadid);
+    thread_join(auto_poll_threadid, NULL);
+    thread_destroy(auto_poll_threadid);
 
     DeleteCriticalSection(&keypair_lock);
     DeleteCriticalSection(&auto_poll_stop_lock);

src/main/aciodrv/device.c

@@ -7,9 +7,8 @@
 
 #include "aciodrv/port.h"
 
-#include "core/log.h"
-
 #include "util/hex.h"
+#include "util/log.h"
 #include "util/mem.h"
 
 /* Enable to dump all data to the logger */

src/main/aciodrv/h44b.c

@@ -7,7 +7,7 @@
 
 #include "aciodrv/device.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 bool aciodrv_h44b_init(struct aciodrv_device_ctx *device, uint8_t node_id)
 {

src/main/aciodrv/icca.c

@@ -5,7 +5,7 @@
 #include "aciodrv/device.h"
 #include "aciodrv/icca.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 static bool aciodrv_icca_queue_loop_start(
     struct aciodrv_device_ctx *device, uint8_t node_id)

src/main/aciodrv/kfca.c

@@ -5,7 +5,7 @@
 
 #include "aciodrv/device.h"
 
-#include "core/log.h"
+#include "util/log.h"
 
 static bool
 aciodrv_kfca_watchdog_start(struct aciodrv_device_ctx *device, uint8_t node_id)