Use dtk-template for ninja build (#216)

* shift-jis purge dtk part 1 Co-Authored-By: roeming <25447777+roeming@users.noreply.github.com> Co-Authored-By: Luke Street <549122+encounter@users.noreply.github.com> * build versioning and static prints Co-Authored-By: roeming <25447777+roeming@users.noreply.github.com> Co-Authored-By: Luke Street <549122+encounter@users.noreply.github.com> * actual dtk stuff woop? Co-Authored-By: roeming <25447777+roeming@users.noreply.github.com> Co-Authored-By: Luke Street <549122+encounter@users.noreply.github.com> * suspicious file changes @roeming please investigate these changes Co-Authored-By: roeming <25447777+roeming@users.noreply.github.com> * version reconciliation the else blocks really should be futureproofed * minor correction of global to weak also replace configure.py and purge linker-map.txt * Update Makefile * makefile and ninja silliness * Update build.yml * makefile test * Update build.yml * Update Makefile * All fixed * More JP string fixes * Fix demo all_source build * Add objdiff report, Makefile dep autodownloads, lots of cleanup & more * Update README * Update progress badges * Restore old docs * changing FILE_POS.c to FILE_POS.C * Rename FILE_POS.c to FILE_POS.C * fix for make --------- Co-authored-by: EpochFlame <jupiterror@gmail.com> Co-authored-by: roeming <25447777+roeming@users.noreply.github.com> Co-authored-by: Luke Street <549122+encounter@users.noreply.github.com> Co-authored-by: roeming <brother64youyou@gmail.com>
2024-11-26 23:00:27 +00:00 · 2024-08-16 22:36:56 -06:00 · 2024-08-16 22:36:56 -06:00 · 7d23ceeecc
commit 7d23ceeecc
parent 61001ac470
324 changed files with 115214 additions and 29623 deletions
--- a/.flake8
+++ b/.flake8
@ -0,0 +1,4 @@
+[flake8]
+# E203: whitespace before ':'
+# E501: line too long
+extend-ignore = E203,E501
--- a/.gitattributes
+++ b/.gitattributes
@ -8,3 +8,6 @@
 *.bat  text eol=crlf
 *.sh   text eol=lf
 *.sha1 text eol=lf
+
+# decomp-toolkit writes files with LF
+config/**/*.txt  text eol=lf
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -12,29 +12,43 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        version: [usa, usa.demo]
+        version: [GPVE01, GPVE01_D17]
    steps:
    - name: Checkout
      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
    - name: Git config
      run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+    - name: Prepare
+      run: cp -R /orig .
    - name: Build
      run: |
-        python configure.py -m -v ${{matrix.version}} --compilers /compilers/GC
-        ninja
+        python configure.py --map --version ${{ matrix.version }} \
+            --binutils /binutils --compilers /compilers
+        ninja all_source build/${{ matrix.version }}/progress.json \
+            build/${{ matrix.version }}/report.json
    - name: Upload progress
      if: github.ref == 'refs/heads/main'
      continue-on-error: true
      env:
+        PROGRESS_SLUG: pikmin2
        PROGRESS_API_KEY: ${{secrets.PROGRESS_API_KEY}}
      run: |
-        python tools/upload-progress.py -b https://progress.decomp.club/ -p pikmin2 -v ${{matrix.version}} \
-          build/pikmin2.${{matrix.version}}/main.dol.progress
+        python tools/upload_progress.py -b https://progress.decomp.club/ \
+          -p $PROGRESS_SLUG -v ${{ matrix.version }} \
+          build/${{ matrix.version }}/progress.json
    - name: Upload map
      uses: actions/upload-artifact@v4
      with:
-        name: pikmin2UP-${{matrix.version}}.MAP
-        path: build/*/pikmin2UP.MAP
+        name: ${{ matrix.version }}_maps
+        path: build/${{ matrix.version }}/**/*.MAP
+    - name: Upload report
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ matrix.version }}_report
+        path: build/${{ matrix.version }}/report.json

  build_make:
    name: Build (legacy)
@ -43,13 +57,15 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        version: [usa, usa.demo]
+        version: [GPVE01, GPVE01_D17]
    steps:
    - name: Checkout
      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
    - name: Git config
      run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
    - name: Build
      run: |
-        python configure.py --map --compilers /compilers/GC
-        make -j$(nproc) MAPGENFLAG=1 VERSION=${{matrix.version}} COMPILERS=/compilers/GC
+        make -j$(nproc) MAPGENFLAG=1 VERSION=${{matrix.version}}
--- a/.gitignore
+++ b/.gitignore
@ -51,3 +51,11 @@ __pycache__
 .ninja_log
 newlines.py
 objdiff.json
+
+.idea
+.ninja_*
+.mypy_cache
+
+orig/*/*
+!orig/*/.gitkeep
+/*.txt
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,10 +1,10 @@
 {
    "[c]": {
-        "files.encoding": "shiftjis",
+        "files.encoding": "utf8",
        "editor.defaultFormatter": "ms-vscode.cpptools"
    },
    "[cpp]": {
-        "files.encoding": "shiftjis",
+        "files.encoding": "utf8",
        "editor.defaultFormatter": "ms-vscode.cpptools"
    },
    "editor.tabSize": 4,
@ -59,7 +59,7 @@
        "ctype.h": "c",
        "mem_funcs.h": "c",
        "card.h": "c",
-        "FILE_POS.C": "cpp",
+        "FILE_POS.c": "cpp",
        "ctype_api.h": "c"
    }
-}
+}
--- a/124
+++ b/124
@ -23,15 +23,24 @@ endif
 #-------------------------------------------------------------------------------

 NAME := pikmin2
-VERSION ?= usa
-#VERSION := usa.demo
+VERSION ?= GPVE01
+#VERSION := GPVE01_D17

-ifeq ($(VERSION), usa)
-    VERNUM = 2
-else ifeq ($(VERSION), usa.demo)
-    VERNUM = 1
-else
+# only GPVE01 and GPVE01_D17 are implemented right now --EpochFlame
+
+ifeq ($(VERSION), GPVE01)
+    VERNUM = 4
+else ifeq ($(VERSION), GPVE01_D17)
    VERNUM = 0
+else ifeq ($(VERSION), GPVE01_D18)
+    VERNUM = 1
+else ifeq ($(VERSION), GPVJ01)
+    VERNUM = 2
+else ifeq ($(VERSION), GPVP01)
+    VERNUM = 3
+# default to usa retail
+else
+    VERNUM = 4
 endif

 # Use the all-in-one updater after successful build? (Fails on non-windows platforms)
@ -80,35 +89,35 @@ DEPENDS += $(MAKECMDGOALS:.o=.d)
 MWCC_VERSION := 2.6
 MWLD_VERSION := 2.6

+# Tool versions (keep in sync with configure.py)
+BINUTILS_TAG  := 2.42-1
+COMPILERS_TAG := 20240706
+DTK_TAG       := v0.9.4
+SJISWRAP_TAG  := v1.1.1
+WIBO_TAG      := 0.6.11
+
 # Programs
-POWERPC ?= tools/powerpc
+BINUTILS  ?= build/binutils
+COMPILERS ?= build/compilers
+DTK       ?= build/tools/dtk
+SJISWRAP  ?= build/tools/sjiswrap.exe
+WIBO      ?= build/tools/wibo
 ifeq ($(WINDOWS),1)
-  WINE :=
-  AS      := $(POWERPC)/powerpc-eabi-as.exe
+  WRAPPER :=
+  AS      := $(BINUTILS)/powerpc-eabi-as.exe
  PYTHON  := python
 else
-  WIBO   := $(shell command -v wibo 2> /dev/null)
-  ifdef WIBO
-    WINE ?= wibo
-  else
-    WINE ?= wine
-  endif
-  # Disable wine debug output for cleanliness
-  export WINEDEBUG ?= -all
-  AS := $(POWERPC)/powerpc-eabi-as
+  WRAPPER := $(WIBO)
+  AS      := $(BINUTILS)/powerpc-eabi-as
  PYTHON  := python3
 endif
-COMPILERS ?= tools/mwcc_compiler
-CC      = $(WINE) $(COMPILERS)/$(MWCC_VERSION)/mwcceppc.exe
-LD      := $(WINE) $(COMPILERS)/$(MWLD_VERSION)/mwldeppc.exe
-DTK     := tools/dtk
-ELF2DOL := $(DTK) elf2dol
-SHASUM  := $(DTK) shasum
+CC  = $(WRAPPER) $(SJISWRAP) $(COMPILERS)/GC/$(MWCC_VERSION)/mwcceppc.exe
+LD := $(WRAPPER) $(COMPILERS)/GC/$(MWLD_VERSION)/mwldeppc.exe

 ifneq ($(WINDOWS),1)
-TRANSFORM_DEP := tools/transform-dep.py
+TRANSFORM_DEP := tools/transform_dep.py
 else
-TRANSFORM_DEP := tools/transform-win.py
+TRANSFORM_DEP := tools/transform_win.py
 endif

 # Options
@ -125,7 +134,7 @@ ifeq ($(VERBOSE),0)
 LDFLAGS := $(MAPGEN) -fp hard -nodefaults -w off
 endif
 LIBRARY_LDFLAGS := -nodefaults -fp hard -proc gekko
-CFLAGS  := -Cpp_exceptions off -enum int -inline auto -proc gekko -RTTI off -fp hard -fp_contract on -rostr -O4,p -use_lmw_stmw on -common on -sdata 8 -sdata2 8 -nodefaults -MMD -DVERNUM=$(VERNUM) $(INCLUDES)
+CFLAGS  := -Cpp_exceptions off -enum int -inline auto -proc gekko -RTTI off -fp hard -fp_contract on -rostr -O4,p -use_lmw_stmw on -common on -multibyte -sdata 8 -sdata2 8 -nodefaults -MMD -DVERNUM=$(VERNUM) $(INCLUDES)

 ifeq ($(VERBOSE),0)
 # this set of ASFLAGS generates no warnings.
@ -152,24 +161,45 @@ DUMMY != mkdir -p $(ALL_DIRS)
 LDSCRIPT := ldscript.lcf

 $(DOL): $(ELF) | $(DTK)
-	$(QUIET) $(ELF2DOL) $< $@
-	$(QUIET) $(SHASUM) -c sha1/$(NAME).$(VERSION).sha1
+	$(QUIET) $(DTK) elf2dol $< $@
+	$(QUIET) $(DTK) shasum -c sha1/$(NAME).$(VERSION).sha1
 ifneq ($(findstring -map,$(LDFLAGS)),)
 	$(QUIET) $(PYTHON) tools/calcprogress.py $(DOL) $(MAP)
 endif
 ifeq ($(USE_AOI),1)
-	$(WINE) ./aoi.exe
+	./aoi.exe
 endif

 clean:
 	rm -f -d -r build

-$(DTK): tools/dtk_version
+$(DTK):
 	@echo "Downloading $@"
-	$(QUIET) $(PYTHON) tools/download_dtk.py $< $@
+	$(QUIET) mkdir -p $(dir $@)
+	$(QUIET) $(PYTHON) tools/download_tool.py dtk $@ --tag $(DTK_TAG)
+
+$(SJISWRAP):
+	@echo "Downloading $@"
+	$(QUIET) mkdir -p $(dir $@)
+	$(QUIET) $(PYTHON) tools/download_tool.py sjiswrap $@ --tag $(SJISWRAP_TAG)
+
+$(BINUTILS):
+	@echo "Downloading $@"
+	$(QUIET) mkdir -p $(dir $@)
+	$(QUIET) $(PYTHON) tools/download_tool.py binutils $@ --tag $(BINUTILS_TAG)
+
+$(COMPILERS):
+	@echo "Downloading $@"
+	$(QUIET) mkdir -p $(dir $@)
+	$(QUIET) $(PYTHON) tools/download_tool.py compilers $@ --tag $(COMPILERS_TAG)
+
+$(WIBO):
+	@echo "Downloading $@"
+	$(QUIET) mkdir -p $(dir $@)
+	$(QUIET) $(PYTHON) tools/download_tool.py wibo $@ --tag $(WIBO_TAG)

 # ELF creation makefile instructions
-$(ELF): $(O_FILES) $(LDSCRIPT)
+$(ELF): $(O_FILES) $(LDSCRIPT) $(WRAPPER) $(COMPILERS)
 	@echo Linking ELF $@
 	$(QUIET) @echo $(O_FILES) > build/o_files
 	$(QUIET) $(LD) $(LDFLAGS) -o $@ -lcf $(LDSCRIPT) @build/o_files
@ -185,46 +215,32 @@ ifneq ($(MAKECMDGOALS), clean)
 -include $(DEPENDS)
 endif

-$(BUILD_DIR)/%.o: %.s
+$(BUILD_DIR)/%.o: %.s | $(BINUTILS) $(DTK)
 	@echo Assembling $<
 	$(QUIET) mkdir -p $(dir $@)
 	$(QUIET) $(AS) $(ASFLAGS) -o $@ $<
+	$(QUIET) $(DTK) elf fixup $@ $@

-# for files with capitalized .C extension
-$(BUILD_DIR)/%.o: %.C
+$(BUILD_DIR)/%.o: %.c | $(WRAPPER) $(COMPILERS) $(SJISWRAP)
 	@echo "Compiling " $<
 	$(QUIET) mkdir -p $(dir $@)
 	$(QUIET) $(CC) $(CFLAGS) -c -o $(dir $@) $<

-$(BUILD_DIR)/%.o: %.c
+$(BUILD_DIR)/%.o: %.C | $(WRAPPER) $(COMPILERS) $(SJISWRAP)
 	@echo "Compiling " $<
 	$(QUIET) mkdir -p $(dir $@)
 	$(QUIET) $(CC) $(CFLAGS) -c -o $(dir $@) $<

-$(BUILD_DIR)/%.o: %.cp
+$(BUILD_DIR)/%.o: %.cp | $(WRAPPER) $(COMPILERS) $(SJISWRAP)
 	@echo "Compiling " $<
 	$(QUIET) mkdir -p $(dir $@)
 	$(QUIET) $(CC) $(CFLAGS) -c -o $(dir $@) $<

-$(BUILD_DIR)/%.o: %.cpp
+$(BUILD_DIR)/%.o: %.cpp | $(WRAPPER) $(COMPILERS) $(SJISWRAP)
 	@echo "Compiling " $<
 	$(QUIET) mkdir -p $(dir $@)
 	$(QUIET) $(CC) $(CFLAGS) -c -o $(dir $@) $<

-### Extremely lazy recipes for generating context ###
-# Example usage: make build/pikmin2.usa/src/plugProjectYamashitaU/farmMgr.h
-$(BUILD_DIR)/%.h: %.c
-	@echo "Compiling and generating context for " $<
-	$(QUIET) $(CC) $(CFLAGS) -E -c -o $@ $<
-
-$(BUILD_DIR)/%.h: %.cp
-	@echo "Compiling and generating context for " $<
-	$(QUIET) $(CC) $(CFLAGS) -E -c -o $@ $<
-
-$(BUILD_DIR)/%.h: %.cpp
-	@echo "Compiling and generating context for " $<
-	$(QUIET) $(CC) $(CFLAGS) -E -c -o $@ $<
-
 ### Debug Print ###

 print-% : ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true
--- a/README.MD
+++ b/README.MD
@ -1,77 +1,122 @@
-Pikmin 2 [![Build Status]][actions] ![Code Progress] ![Data Progress]
-========
+Pikmin 2  
+[![Build Status]][actions] ![Code Progress] ![Data Progress] [![Discord Badge]][discord]
+=============

 [Build Status]: https://github.com/projectPiki/pikmin2/actions/workflows/build.yml/badge.svg
 [actions]: https://github.com/projectPiki/pikmin2/actions/workflows/build.yml
-[Code Progress]: https://img.shields.io/endpoint?label=Code&url=https%3A%2F%2Fprogress.deco.mp%2Fdata%2Fpikmin2%2Fusa%2Fdol%2F%3Fmode%3Dshield%26measure%3Dcode
-[Data Progress]: https://img.shields.io/endpoint?label=Data&url=https%3A%2F%2Fprogress.deco.mp%2Fdata%2Fpikmin2%2Fusa%2Fdol%2F%3Fmode%3Dshield%26measure%3Ddata
+[Code Progress]: https://img.shields.io/endpoint?label=Code&url=https%3A%2F%2Fprogress.deco.mp%2Fdata%2Fpikmin2%2FGPVE01%2Fdol%2F%3Fmode%3Dshield%26measure%3Dcode
+[Data Progress]: https://img.shields.io/endpoint?label=Data&url=https%3A%2F%2Fprogress.deco.mp%2Fdata%2Fpikmin2%2FGPVE01%2Fdol%2F%3Fmode%3Dshield%26measure%3Ddata
+[Discord Badge]: https://img.shields.io/discord/933849697485983765?color=%237289DA&logo=discord&logoColor=%23FFFFFF
+[discord]: https://discord.gg/CWKqYMePX8

-A decompilation of Pikmin 2.
+A work-in-progress decompilation of Pikmin 2.

-This repository builds the following DOLs:
+Supported versions:

-```
-90d328bf8f190c90472e8c19e7e53c6ad0fe0d1a  build/pikmin2.usa/main.dol
-3730939092688902af4866be66d4a8404ae752c7  build/pikmin2.usa.demo/main.dol
+- `GPVE01`: USA Retail
+- `GPVE01_D17`: USA Demo 17
+
+Index
+-----
+
+- [Dependencies](#dependencies)
+  - [Windows](#windows)
+  - [macOS](#macos)
+  - [Linux](#linux)
+- [Building](#building)
+- [Diffing](#diffing)
+- [Modding](#modding)
+
+Dependencies
+------------
+
+### Windows
+
+On Windows, it's **highly recommended** to use native tooling. WSL or msys2 are **not** required.  
+When running under WSL, [objdiff](#diffing) is unable to get filesystem notifications for automatic rebuilds.
+
+- Install [Python](https://www.python.org/downloads/) and add it to `%PATH%`.
+  - Also available from the [Windows Store](https://apps.microsoft.com/store/detail/python-311/9NRWMJP3717K).
+- Download [ninja](https://github.com/ninja-build/ninja/releases) and add it to `%PATH%`.
+  - Quick install via pip: `pip install ninja`
+
+### macOS
+
+- Install [ninja](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages):
+
+  ```sh
+  brew install ninja
+  ```
+
+- Install [wine-crossover](https://github.com/Gcenx/homebrew-wine):
+
+  ```sh
+  brew install --cask --no-quarantine gcenx/wine/wine-crossover
+  ```
+
+After OS upgrades, if macOS complains about `Wine Crossover.app` being unverified, you can unquarantine it using:
+
+```sh
+sudo xattr -rd com.apple.quarantine '/Applications/Wine Crossover.app'
 ```

-> **Note**
-> The ROM this repository builds can be shifted. You are able to add
-> and remove code as you see fit, for modding or research purposes.
+### Linux

-## Building
+- Install [ninja](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages).
+- For non-x86(_64) platforms: Install wine from your package manager.
+  - For x86(_64), [wibo](https://github.com/decompals/wibo), a minimal 32-bit Windows binary wrapper, will be automatically downloaded and used.

-### Required Tools
-[Python 3.8+](https://www.python.org/downloads/)
+Building
+--------

-### Instructions
+- Clone the repository:

-1. Clone the repo using `git clone https://github.com/projectPiki/pikmin2/`
+  ```sh
+  git clone https://github.com/projectPiki/pikmin2.git
+  ```

-2. Run `configure.py` to automatically download/build any other necessary files for the project.
+- Using [Dolphin Emulator](https://dolphin-emu.org/), extract your game's system data to `orig/GPVE01`. (Or `orig/GPVE01_D17` for demo)
+  - Right-click the game in Dolphin's game list and select `Properties`.
+  - Go to the `Filesystem` tab and right-click `Disc` -> `Extract System Data`.
+![Dolphin filesystem extract](assets/dolphin-extract.png)
+  - After extraction, the following file should exist: `orig/GPVE01/sys/main.dol`.
+- Configure:

-3. Enter `ninja` (recommended) or `make -j` in a command prompt or terminal.
-	- `-j` Allows `make` to use multiple threads, speeding up the process.
-	- `ninja` already implicitly uses the max amount of cores available, only use `-j` to *decrease* the thread count.
-	- If just `-j` gives errors on your setup, try specifying a set number of threads, e.g. `make -j 4`.
+  ```sh
+  python configure.py
+  ```

-* OPTIONAL STEPS:
-	- Obtain a clean DOL of Pikmin 2 USA 1.0 and place it in the base working directory and rename it to `baserom.dol`.
-	- To generate a linker map (takes a considerable amount of time), run `ninja -m` or  `make MAPGENFLAG=1 -j`.
-	- The project uses clang-format for a consistent style. Download the [correct version](https://cdn.discordapp.com/attachments/933849922418126918/1031358615300345856/clang-format.exe) and place in the main repo directory (e.g. `pikmin2/clang-format.exe`).
+  To use the demo version, add `--version GPVE01_D17`. Add `--help` to see all available options.
+- Build:

-* See [this video](https://youtu.be/CZXNQagqpkw) for a walkthrough of the steps on Windows (thanks Altafen for making this!).
+  ```sh
+  ninja
+  ```

-### Decompilation workflow
+Diffing
+-------

- The project is compatible with [objdiff](https://github.com/encounter/objdiff), which is highly recommended for local decompilation testing. Objdiff can be built from source, or the latest stable build obtained from GitHub actions (recommended).
+Once the initial build succeeds, an `objdiff.json` should exist in the project root.

- To obtain the latest stable build:
-	1. Navigate to the `Actions` tab of the objdiff repo.
-	2. Select the latest `main` workflow.
-	3. Scroll to the bottom of the page and download the `stable` release for your platform (Mac, Linux, Windows).
-	4. Extract contents of `.zip` to obtain an executable version.
+Download the latest release from [encounter/objdiff](https://github.com/encounter/objdiff). Under project settings, set `Project directory`. The configuration should be loaded automatically.

- To set up objdiff for this project:
-	1. Run `objdiff.exe`.
-	2. Set:
-		- Project dir: `/path/to/cloned/pikmin2`.
-		- Custom make program: `ninja` or `make`, depending on what was used to build previously.
-			- If specifying the name isn't enough, it's likely the program isn't on your `PATH`; try an absolute path instead.
-		- (`make` only) Build config: `None`.
-		- (`make` only) Select target build dir: `/path/to/cloned/pikmin2/build/pikmin2.usa/asm`.
-		- (`make` only) Select base build dir: `/path/to/cloned/pikmin2/build/pikmin2.usa/src`.
-	3. Select desired object file to diff:
-		- With `ninja`, an explorer viewer is provided after applying the previous settings.
-		- With `make`, you must explicitly select the object each time (likely from `pikmin2/build/pikmin2.usa/asm/LIBRARY/OBJECTFILE.o`).
-	4. Decomp it!
+Select an object from the left sidebar to begin diffing. Changes to the project will rebuild automatically: changes to source files, headers, `configure.py`, `splits.txt` or `symbols.txt`.

-### Generating Context for decomp.me Scratches
+![objdiff project configuration](assets/objdiff.png)

- [decomp.me](https://decomp.me/) is an online decompilation sharing hub, allowing 'scratches' of functions to be generated and collaborated on.
- Stand-alone decompilation packages and tools such as decomp.me require information on the functions and structures of the project in order to parse extracted blocks correctly. The easiest way to do this is to pass the tool just the necessary 'context' for the file, i.e. a set of all the headers used by the file that's being worked on.
- A recursive context processing script is included in the repo ([tools/decompctx.py](https://github.com/projectPiki/pikmin2/tree/main/tools/decompctx.py)), which generates a `ctx.c` file in the root directory.
-	- The contents of this can then be copied and pasted into the 'Context' section of a decomp.me scratch or similar.
- To use, call the generator via the terminal/command line from the root directory (replacing DIRECTORY and FILE as required):
-	```python tools/decompctx.py src/DIRECTORY/FILE.cpp```
- Credit to encounter and the [Metroid Prime decomp project](https://github.com/PrimeDecomp/prime) for the script!
+Modding
+-------
+
+To enable modding, run `configure.py` with the `--non-matching` flag:
+
+```sh
+python configure.py --non-matching
+```
+
+This:
+
+- Disables final hash verification.
+- Builds all assembly files in `asm`.
+- Builds all source files marked as `Equivalent` in `configure.py`.
+
+Once built with `ninja`, the new DOL will exist at `build/GPVE01/main.dol`.
--- a/asm/JSystem/J3D/J3DTevs.s
+++ b/asm/JSystem/J3D/J3DTevs.s
@ -174,11 +174,6 @@
 .endobj lbl_804A1900

 .section .bss  # 0x804EFC20 - 0x8051467C
-# J3DTevs.cpp
-# J3DPacket.cpp
-# temporarily moved to J3DTevs.cpp for the sake of alignment
-.comm sGDLObj__17J3DDisplayListObj, 0x10, 4
-
 .comm j3dTexCoordTable, 0x2528, 4
 .comm j3dTevSwapTableTable, 0x400, 4
 .comm j3dAlphaCmpTable, 0x300, 4
--- a/asm/JSystem/JAudio/JAS/JASTrack.s
+++ b/asm/JSystem/JAudio/JAS/JASTrack.s
@ -1,5 +1,5 @@
 .include "macros.inc"
-.if version == 2
+.if version == 4
 .section .sdata, "wa"  # 0x80514680 - 0x80514D80
 .balign 8
 .obj zz_80514788, local
@ -48,7 +48,7 @@
 	.4byte .L_800A1CB8
 .endobj lbl_804A4394

-.if version == 1
+.if version == 0
 .balign 32
 .obj c32, local
 	.float 1.0
@ -4155,7 +4155,7 @@
 /* 800A2654 0009F594  4E 80 00 20 */	blr 
 .endfn panCalc__8JASTrackFfffUc

-.if version == 1
+.if version == 0
 .fn rootCallback__8JASTrackFPv, global
 /* 800A2658 0009F598  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 800A265C 0009F59C  7C 08 02 A6 */	mflr r0
--- a/asm/plugProjectKandoU/baseGameSection.s
+++ b/asm/plugProjectKandoU/baseGameSection.s
@ -765,7 +765,7 @@ lbl_constructor:
 .endobj lbl_80520E58

 .section .text, "ax"  # 0x800056C0 - 0x80472F00
-.if version == 1
+.if version == 0
 .fn __ct__Q24Game15BaseGameSectionFP7JKRHeap, global
 /* 8014ADA0 00147CE0  94 21 FF D0 */	stwu r1, -0x30(r1)
 /* 8014ADA4 00147CE4  7C 08 02 A6 */	mflr r0
@ -1149,7 +1149,7 @@ lbl_constructor:
 /* 8014B0F8 00148038  4E 80 00 20 */	blr 
 .endfn __dt__8WipeBaseFv

-.if version == 1
+.if version == 0
 .fn useSpecificFBTexture__Q24Game15BaseGameSectionFP10JUTTexture, global
 /* 8014B0FC 0014803C  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8014B100 00148040  7C 08 02 A6 */	mflr r0
@ -1217,7 +1217,7 @@ lbl_constructor:
 .endfn useSpecificFBTexture__Q24Game15BaseGameSectionFP10JUTTexture
 .endif

-.if version == 1
+.if version == 0
 .fn restoreFBTexture__Q24Game15BaseGameSectionFv, global
 /* 8014B170 001480B0  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8014B174 001480B4  7C 08 02 A6 */	mflr r0
@ -1281,7 +1281,7 @@ lbl_constructor:
 .endfn restoreFBTexture__Q24Game15BaseGameSectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn __dt__Q24Game15BaseGameSectionFv, global
 /* 8014B1DC 0014811C  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8014B1E0 00148120  7C 08 02 A6 */	mflr r0
@ -1435,7 +1435,7 @@ lbl_constructor:
 .endfn __dt__Q24Game15BaseGameSectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn loadSync__Q24Game15BaseGameSectionFP9IDelegateb, global
 /* 8014B2F0 00148230  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8014B2F4 00148234  7C 08 02 A6 */	mflr r0
@ -1483,7 +1483,7 @@ lbl_constructor:
 .endfn loadSync__Q24Game15BaseGameSectionFP9IDelegateb
 .endif

-.if version == 1
+.if version == 0
 .fn waitSyncLoad__Q24Game15BaseGameSectionFb, global
 /* 8014B340 00148280  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8014B344 00148284  7C 08 02 A6 */	mflr r0
@ -1669,7 +1669,7 @@ lbl_constructor:
 /* 8014B4AC 001483EC  4E 80 00 20 */	blr 
 .endfn dvdloadGameSystem__Q24Game15BaseGameSectionFv

-.if version == 1
+.if version == 0
 .fn init__Q24Game15BaseGameSectionFv, global
 /* 8014B4B0 001483F0  94 21 FF A0 */	stwu r1, -0x60(r1)
 /* 8014B4B4 001483F4  7C 08 02 A6 */	mflr r0
@ -2172,7 +2172,7 @@ lbl_constructor:
 /* 8014B878 001487B8  4E 80 00 20 */	blr 
 .endfn section_fadeout__Q24Game15BaseGameSectionFv

-.if version == 1
+.if version == 0
 .fn doUpdate__Q24Game15BaseGameSectionFv, global
 /* 8014B87C 001487BC  94 21 FF D0 */	stwu r1, -0x30(r1)
 /* 8014B880 001487C0  7C 08 02 A6 */	mflr r0
@ -2690,7 +2690,7 @@ lbl_constructor:
 /* 8014BC24 00148B64  4E 80 00 20 */	blr 
 .endfn onUpdate__Q24Game15BaseGameSectionFv

-.if version == 1
+.if version == 0
 .fn doDraw__Q24Game15BaseGameSectionFR8Graphics, global
 /* 8014BC28 00148B68  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8014BC2C 00148B6C  7C 08 02 A6 */	mflr r0
@ -2896,7 +2896,7 @@ lbl_constructor:
 /* 8014BD98 00148CD8  4E 80 00 20 */	blr 
 .endfn pre2dDraw__Q24Game15BaseGameSectionFR8Graphics

-.if version == 1
+.if version == 0
 .fn movieDone__Q24Game15BaseGameSectionFPQ24Game11MovieConfigUlUl, global
 /* 8014BD9C 00148CDC  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8014BDA0 00148CE0  7C 08 02 A6 */	mflr r0
@ -3012,7 +3012,7 @@ lbl_constructor:
 /* 8014BEA0 00148DE0  4E 80 00 20 */	blr 
 .endfn onMovieCommand__Q24Game15BaseGameSectionFi

-.if version == 1
+.if version == 0
 .fn initJ3D__Q24Game15BaseGameSectionFv, global
 /* 8014BEA4 00148DE4  94 21 FF C0 */	stwu r1, -0x40(r1)
 /* 8014BEA8 00148DE8  7C 08 02 A6 */	mflr r0
@ -3592,7 +3592,7 @@ lbl_constructor:
 /* 8014C324 00149264  4E 80 00 20 */	blr 
 .endfn initResources__Q24Game15BaseGameSectionFv

-.if version == 1
+.if version == 0
 .fn initViewports__Q24Game15BaseGameSectionFR8Graphics, global
 /* 8014C328 00149268  94 21 FF C0 */	stwu r1, -0x40(r1)
 /* 8014C32C 0014926C  7C 08 02 A6 */	mflr r0
@ -3901,7 +3901,7 @@ lbl_constructor:
 /* 8014C5C8 00149508  4E 80 00 20 */	blr 
 .endfn __dt__12LookAtCameraFv

-.if version == 1
+.if version == 0
 .fn initGenerators__Q24Game15BaseGameSectionFv, global
 /* 8014C5CC 0014950C  94 21 E3 60 */	stwu r1, -0x1ca0(r1)
 /* 8014C5D0 00149510  7C 08 02 A6 */	mflr r0
@ -6326,7 +6326,7 @@ lbl_constructor:
 /* 8014D860 0014A7A0  4E 80 00 20 */	blr 
 .endfn saveToGeneratorCache__Q24Game15BaseGameSectionFPQ24Game10CourseInfo

-.if version == 1
+.if version == 0
 .fn pmTogglePlayer__Q24Game15BaseGameSectionFv, global
 /* 8014D864 0014A7A4  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8014D868 0014A7A8  7C 08 02 A6 */	mflr r0
@ -6432,7 +6432,7 @@ lbl_constructor:
 /* 8014D914 0014A854  4E 80 00 20 */	blr 
 .endfn onPlayerJoin__Q24Game15BaseGameSectionFv

-.if version == 1
+.if version == 0
 .fn setPlayerMode__Q24Game15BaseGameSectionFi, global
 /* 8014D918 0014A858  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8014D91C 0014A85C  7C 08 02 A6 */	mflr r0
@ -6896,7 +6896,7 @@ lbl_constructor:
 /* 8014DD1C 0014AC5C  4E 80 00 20 */	blr 
 .endfn onCameraBlendFinished__Q24Game15BaseGameSectionFPQ24Game9CameraArg

-.if version == 1
+.if version == 0
 .fn setFixNearFar__Q24Game15BaseGameSectionFbff, global
 /* 8014DD20 0014AC60  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8014DD24 0014AC64  7C 08 02 A6 */	mflr r0
@ -6956,7 +6956,7 @@ lbl_constructor:
 .endfn setFixNearFar__Q24Game15BaseGameSectionFbff
 .endif

-.if version == 1
+.if version == 0
 .fn setCamController__Q24Game15BaseGameSectionFv, global
 /* 8014DD88 0014ACC8  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8014DD8C 0014ACCC  7C 08 02 A6 */	mflr r0
@ -7250,7 +7250,7 @@ lbl_constructor:
 /* 8014DF98 0014AED8  4E 80 00 20 */	blr 
 .endfn on_setCamController__Q24Game15BaseGameSectionFi

-.if version == 1
+.if version == 0
 .fn setDefaultPSSceneInfo__Q24Game15BaseGameSectionFRQ26PSGame9SceneInfo, global
 /* 8014DF9C 0014AEDC  94 21 FF D0 */	stwu r1, -0x30(r1)
 /* 8014DFA0 0014AEE0  7C 08 02 A6 */	mflr r0
@ -8405,7 +8405,7 @@ lbl_constructor:
 /* 8014EECC 0014BE0C  4E 80 00 20 */	blr 
 .endfn "prepareFountainOn__Q24Game15BaseGameSectionFR10Vector3<f>"

-.if version == 1
+.if version == 0
 .fn initLights__Q24Game15BaseGameSectionFv, global
 /* 8014EED0 0014BE10  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8014EED4 0014BE14  7C 08 02 A6 */	mflr r0
@ -8484,7 +8484,7 @@ lbl_constructor:
 /* 8014EF60 0014BEA0  4E 80 00 20 */	blr 
 .endfn draw3D__Q24Game15BaseGameSectionFR8Graphics

-.if version == 1
+.if version == 0
 .fn drawParticle__Q24Game15BaseGameSectionFR8Graphicsi, global
 /* 8014EF64 0014BEA4  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8014EF68 0014BEA8  7C 08 02 A6 */	mflr r0
@ -8795,7 +8795,7 @@ lbl_constructor:
 /* 8014F1D8 0014C118  4E 80 00 20 */	blr 
 .endfn test_draw_treasure_detector__Q24Game15BaseGameSectionFv

-.if version == 1
+.if version == 0
 .fn draw2D__Q24Game15BaseGameSectionFR8Graphics, global
 /* 8014F1DC 0014C11C  94 21 FF 80 */	stwu r1, -0x80(r1)
 /* 8014F1E0 0014C120  7C 08 02 A6 */	mflr r0
@ -9029,7 +9029,7 @@ lbl_constructor:
 .endfn draw2D__Q24Game15BaseGameSectionFR8Graphics
 .endif

-.if version == 1
+.if version == 0
 .fn directDraw__Q24Game15BaseGameSectionFR8GraphicsP8Viewport, global
 /* 8014F398 0014C2D8  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8014F39C 0014C2DC  7C 08 02 A6 */	mflr r0
@ -9420,7 +9420,7 @@ lbl_constructor:
 /* 8014F864 0014C7A4  4E 80 00 20 */	blr 
 .endfn doEntry__Q24Game15BaseGameSectionFv

-.if version == 1
+.if version == 0
 .fn doSetView__Q24Game15BaseGameSectionFi, global
 /* 8014F868 0014C7A8  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8014F86C 0014C7AC  7C 08 02 A6 */	mflr r0
@ -9617,7 +9617,7 @@ lbl_constructor:
 /* 8014FA2C 0014C96C  4E 80 00 20 */	blr 
 .endfn doViewCalc__Q24Game15BaseGameSectionFv

-.if version == 1
+.if version == 0
 .fn updateBlendCamera__Q24Game15BaseGameSectionFv, global
 /* 8014FA30 0014C970  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8014FA34 0014C974  7C 08 02 A6 */	mflr r0
@ -9821,7 +9821,7 @@ lbl_constructor:
 .endfn updateBlendCamera__Q24Game15BaseGameSectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn setSplitter__Q24Game15BaseGameSectionFb, global
 /* 8014FBA4 0014CAE4  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8014FBA8 0014CAE8  7C 08 02 A6 */	mflr r0
@ -9887,7 +9887,7 @@ lbl_constructor:
 .endfn setSplitter__Q24Game15BaseGameSectionFb
 .endif

-.if version == 1
+.if version == 0
 .fn updateSplitter__Q24Game15BaseGameSectionFv, global
 /* 8014FC10 0014CB50  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8014FC14 0014CB54  7C 08 02 A6 */	mflr r0
@ -10094,7 +10094,7 @@ lbl_constructor:
 /* 8014FDA0 0014CCE0  4E 80 00 20 */	blr 
 .endfn onStartHeap__Q24Game15BaseGameSectionFv

-.if version == 1
+.if version == 0
 .fn clearHeap__Q24Game15BaseGameSectionFv, global
 /* 8014FDA4 0014CCE4  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8014FDA8 0014CCE8  7C 08 02 A6 */	mflr r0
@ -10490,7 +10490,7 @@ lbl_constructor:
 /* 801500AC 0014CFEC  4E 80 00 20 */	blr 
 .endfn onClearHeap__Q24Game15BaseGameSectionFv

-.if version == 1
+.if version == 0
 .fn startFadeout__Q24Game15BaseGameSectionFf, global
 /* 801500B0 0014CFF0  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 801500B4 0014CFF4  7C 08 02 A6 */	mflr r0
@ -10520,7 +10520,7 @@ lbl_constructor:
 .endfn startFadeout__Q24Game15BaseGameSectionFf
 .endif

-.if version == 1
+.if version == 0
 .fn startFadein__Q24Game15BaseGameSectionFf, global
 /* 801500DC 0014D01C  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 801500E0 0014D020  7C 08 02 A6 */	mflr r0
@ -10550,7 +10550,7 @@ lbl_constructor:
 .endfn startFadein__Q24Game15BaseGameSectionFf
 .endif

-.if version == 1
+.if version == 0
 .fn startFadeoutin__Q24Game15BaseGameSectionFf, global
 /* 80150108 0014D048  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8015010C 0014D04C  7C 08 02 A6 */	mflr r0
@ -10580,7 +10580,7 @@ lbl_constructor:
 .endfn startFadeoutin__Q24Game15BaseGameSectionFf
 .endif

-.if version == 1
+.if version == 0
 .fn startFadeblack__Q24Game15BaseGameSectionFv, global
 /* 80150134 0014D074  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 80150138 0014D078  7C 08 02 A6 */	mflr r0
@ -10618,7 +10618,7 @@ lbl_constructor:
 .endfn startFadeblack__Q24Game15BaseGameSectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn startFadewhite__Q24Game15BaseGameSectionFv, global
 /* 80150170 0014D0B0  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 80150174 0014D0B4  7C 08 02 A6 */	mflr r0
@ -10656,7 +10656,7 @@ lbl_constructor:
 .endfn startFadewhite__Q24Game15BaseGameSectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn setupFixMemory__Q24Game15BaseGameSectionFv, global
 /* 801501AC 0014D0EC  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 801501B0 0014D0F0  7C 08 02 A6 */	mflr r0
@ -10898,7 +10898,7 @@ lbl_constructor:
 .endfn setupFixMemory__Q24Game15BaseGameSectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn setupFixMemory_dvdload__Q24Game15BaseGameSectionFv, global
 /* 8015036C 0014D2AC  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 80150370 0014D2B0  7C 08 02 A6 */	mflr r0
@ -11374,7 +11374,7 @@ lbl_constructor:
 /* 8015070C 0014D64C  4E 80 00 20 */	blr 
 .endfn disableAllocHalt__Q24Game15BaseGameSectionFv

-.if version == 1
+.if version == 0
 .fn setupFloatMemory__Q24Game15BaseGameSectionFv, global
 /* 80150710 0014D650  94 21 FD 40 */	stwu r1, -0x2c0(r1)
 /* 80150714 0014D654  7C 08 02 A6 */	mflr r0
@ -13179,7 +13179,7 @@ lbl_constructor:
 /* 80151458 0014E398  4E 80 00 20 */	blr 
 .endfn "__dt__Q28PSSystem28SingletonBase<Q23PSM6ObjMgr>Fv"

-.if version == 1
+.if version == 0
 .fn setDrawBuffer__Q24Game15BaseGameSectionFi, global
 /* 8015145C 0014E39C  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 80151460 0014E3A0  7C 08 02 A6 */	mflr r0
--- a/asm/plugProjectKandoU/pelletMgr.s
+++ b/asm/plugProjectKandoU/pelletMgr.s
@ -8716,7 +8716,7 @@ lbl_constructor:
 /* 8016C5E8 00169528  4E 80 00 20 */	blr 
 .endfn closeTextArc__Q24Game13BasePelletMgrFP10JKRArchive

-.if version == 1
+.if version == 0
 .fn useModelMgr__Q24Game13BasePelletMgrFiUl, global
 /* 8016C5EC 0016952C  94 21 FF D0 */	stwu r1, -0x30(r1)
 /* 8016C5F0 00169530  7C 08 02 A6 */	mflr r0
@ -8862,7 +8862,7 @@ lbl_constructor:
 /* 8016C6FC 0016963C  4E 80 00 20 */	blr 
 .endfn onCreateModel__Q24Game13BasePelletMgrFPQ28SysShape5Model

-.if version == 1
+.if version == 0
 .fn createShape__Q24Game13BasePelletMgrFii, global
 /* 8016C700 00169640  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8016C704 00169644  7C 08 02 A6 */	mflr r0
--- a/asm/plugProjectKandoU/pelletState.s
+++ b/asm/plugProjectKandoU/pelletState.s
@ -1129,7 +1129,7 @@ lbl_constructor:
 /* 801A4D54 001A1C94  4E 80 00 20 */	blr 
 .endfn init__Q24Game15PelletGoalStateFPQ24Game6PelletPQ24Game8StateArg

-.if version == 1
+.if version == 0
 .fn checkMovie__Q24Game15PelletGoalStateFPQ24Game6Pellet, global
 /* 801A4D58 001A1C98  94 21 FD 40 */	stwu r1, -0x2c0(r1)
 /* 801A4D5C 001A1C9C  7C 08 02 A6 */	mflr r0
--- a/asm/plugProjectKandoU/singleGS_CaveResult.s
+++ b/asm/plugProjectKandoU/singleGS_CaveResult.s
@ -245,7 +245,7 @@ lbl_constructor:
 /* 8021AE38 00217D78  4E 80 00 20 */	blr 
 .endfn init__Q34Game10SingleGame15CaveResultStateFPQ24Game17SingleGameSectionPQ24Game8StateArg

-.if version == 1
+.if version == 0
 .fn loadResource__Q34Game10SingleGame15CaveResultStateFv, global
 /* 8021AE3C 00217D7C  94 21 FF A0 */	stwu r1, -0x60(r1)
 /* 8021AE40 00217D80  7C 08 02 A6 */	mflr r0
@ -559,7 +559,7 @@ lbl_constructor:
 .endfn loadResource__Q34Game10SingleGame15CaveResultStateFv
 .endif

-.if version == 1
+.if version == 0
 .fn exec__Q34Game10SingleGame15CaveResultStateFPQ24Game17SingleGameSection, global
 /* 8021B07C 00217FBC  94 21 FF 80 */	stwu r1, -0x80(r1)
 /* 8021B080 00217FC0  7C 08 02 A6 */	mflr r0
@ -1013,7 +1013,7 @@ lbl_constructor:
 /* 8021B420 00218360  4E 80 00 20 */	blr 
 .endfn draw__Q34Game10SingleGame15CaveResultStateFPQ24Game17SingleGameSectionR8Graphics

-.if version == 1
+.if version == 0
 .fn cleanup__Q34Game10SingleGame15CaveResultStateFPQ24Game17SingleGameSection, global
 /* 8021B424 00218364  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8021B428 00218368  7C 08 02 A6 */	mflr r0
@ -1123,7 +1123,7 @@ lbl_constructor:
 .endfn cleanup__Q34Game10SingleGame15CaveResultStateFPQ24Game17SingleGameSection
 .endif

-.if version == 1
+.if version == 0
 .fn createResultNodes__Q34Game10SingleGame15CaveResultStateFv, global
 /* 8021B4E8 00218428  94 21 FF C0 */	stwu r1, -0x40(r1)
 /* 8021B4EC 0021842C  7C 08 02 A6 */	mflr r0
--- a/asm/plugProjectKandoU/singleGS_Zukan.s
+++ b/asm/plugProjectKandoU/singleGS_Zukan.s
@ -2041,7 +2041,7 @@ lbl_constructor:
 /* 802225D4 0021F514  4E 80 00 20 */	blr 
 .endfn __ct__Q34Game10SingleGame10ZukanStateFv

-.if version == 1
+.if version == 0
 .fn init__Q34Game10SingleGame10ZukanStateFPQ24Game17SingleGameSectionPQ24Game8StateArg, global
 /* 802225D8 0021F518  94 21 FF B0 */	stwu r1, -0x50(r1)
 /* 802225DC 0021F51C  7C 08 02 A6 */	mflr r0
@ -4830,7 +4830,7 @@ lbl_constructor:
 /* 80224B48 00221A88  4E 80 00 20 */	blr 
 .endfn drawLightEffect__Q34Game10SingleGame10ZukanStateFPQ24Game17SingleGameSectionR8Graphics

-.if version == 1
+.if version == 0
 .fn dvdloadA__Q34Game10SingleGame10ZukanStateFv, global
 /* 80224B4C 00221A8C  94 21 F9 00 */	stwu r1, -0x700(r1)
 /* 80224B50 00221A90  7C 08 02 A6 */	mflr r0
@ -6211,7 +6211,7 @@ lbl_constructor:
 /* 80225600 00222540  4E 80 00 20 */	blr 
 .endfn createPellet__Q34Game10SingleGame10ZukanStateFi

-.if version == 1
+.if version == 0
 .fn dvdloadB_teki__Q34Game10SingleGame10ZukanStateFv, global
 /* 80225604 00222544  94 21 FE 80 */	stwu r1, -0x180(r1)
 /* 80225608 00222548  7C 08 02 A6 */	mflr r0
@ -7985,7 +7985,7 @@ lbl_constructor:
 .endfn dvdloadB_teki__Q34Game10SingleGame10ZukanStateFv
 .endif

-.if version == 1
+.if version == 0
 .fn dvdloadB_pellet__Q34Game10SingleGame10ZukanStateFv, global
 /* 802262E0 00223220  94 21 FF 80 */	stwu r1, -0x80(r1)
 /* 802262E4 00223224  7C 08 02 A6 */	mflr r0
@ -9030,7 +9030,7 @@ lbl_constructor:
 /* 80226D4C 00223C8C  4E 80 00 20 */	blr 
 .endfn clearHeapB_pellet__Q34Game10SingleGame10ZukanStateFv

-.if version == 1
+.if version == 0
 .fn clearHeaps__Q34Game10SingleGame10ZukanStateFv, global
 /* 80226D50 00223C90  94 21 FC B0 */	stwu r1, -0x350(r1)
 /* 80226D54 00223C94  7C 08 02 A6 */	mflr r0
--- a/asm/plugProjectKandoU/vsCardMgr.s
+++ b/asm/plugProjectKandoU/vsCardMgr.s
@ -800,7 +800,7 @@ lbl_constructor:
 /* 80235A7C 002329BC  4E 80 00 20 */	blr 
 .endfn stopSlot__Q34Game6VsGame7CardMgrFi

-.if version == 1
+.if version == 0
 .fn usePlayerCard__Q34Game6VsGame7CardMgrFiPQ34Game6VsGame7TekiMgr, global
 /* 80235A80 002329C0  94 21 FE A0 */	stwu r1, -0x160(r1)
 /* 80235A84 002329C4  7C 08 02 A6 */	mflr r0
@ -2811,7 +2811,7 @@ lbl_constructor:
 /* 80236A1C 0023395C  4E 80 00 20 */	blr 
 .endfn clear__Q44Game6VsGame7CardMgr11SlotMachineFv

-.if version == 1
+.if version == 0
 .fn start__Q44Game6VsGame7CardMgr11SlotMachineFv, global
 /* 80236A20 00233960  94 21 FF 40 */	stwu r1, -0xc0(r1)
 /* 80236A24 00233964  7C 08 02 A6 */	mflr r0
--- a/asm/plugProjectMorimuraU/challengeSelect2D.s
+++ b/asm/plugProjectMorimuraU/challengeSelect2D.s
@ -3358,7 +3358,7 @@ lbl_constructor:
 /* 8038EBE4 0038BB24  4E 80 00 20 */	blr 
 .endfn __dt__Q28Morimura16TChallengeSelectFv

-.if version == 1
+.if version == 0
 .fn doCreate__Q28Morimura16TChallengeSelectFP10JKRArchive, global
 /* 8038EC1C 0038BB5C  94 21 F8 60 */	stwu r1, -0x7a0(r1)
 /* 8038EC20 0038BB60  7C 08 02 A6 */	mflr r0
@ -7059,7 +7059,7 @@ lbl_constructor:
 .endfn doCreate__Q28Morimura16TChallengeSelectFP10JKRArchive
 .endif

-.if version == 1
+.if version == 0
 .fn doUpdate__Q28Morimura16TChallengeSelectFv, global
 /* 803907D0 0038D710  94 21 FF 00 */	stwu r1, -0x100(r1)
 /* 803907D4 0038D714  7C 08 02 A6 */	mflr r0
@ -10323,7 +10323,7 @@ lbl_constructor:
 /* 8039215C 0038F09C  4E 80 00 20 */	blr 
 .endfn doDraw__Q28Morimura16TChallengeSelectFR8Graphics

-.if version == 1
+.if version == 0
 .fn doUpdateFadeoutFinish__Q28Morimura16TChallengeSelectFv, global
 /* 80392160 0038F0A0  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 80392164 0038F0A4  7C 08 02 A6 */	mflr r0
@ -10397,7 +10397,7 @@ lbl_constructor:
 .endfn doUpdateFadeoutFinish__Q28Morimura16TChallengeSelectFv
 .endif

-.if version == 1
+.if version == 0
 .fn setInfo__Q28Morimura16TChallengeSelectFi, global
 /* 803921D8 0038F118  94 21 FF B0 */	stwu r1, -0x50(r1)
 /* 803921DC 0038F11C  7C 08 02 A6 */	mflr r0
@ -11008,7 +11008,7 @@ lbl_constructor:
 /* 8039269C 0038F5DC  4E 80 00 20 */	blr 
 .endfn setStageName__Q28Morimura16TChallengeSelectFi

-.if version == 1
+.if version == 0
 .fn getState__Q28Morimura16TChallengeSelectFi, global
 /* 803926A0 0038F5E0  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 803926A4 0038F5E4  7C 08 02 A6 */	mflr r0
@ -11188,7 +11188,7 @@ lbl_constructor:
 .endfn getState__Q28Morimura16TChallengeSelectFi
 .endif

-.if version == 1
+.if version == 0
 .fn getAfterState__Q28Morimura16TChallengeSelectFi, global
 /* 803927CC 0038F70C  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 803927D0 0038F710  7C 08 02 A6 */	mflr r0
@ -11288,7 +11288,7 @@ lbl_constructor:
 .endfn getAfterState__Q28Morimura16TChallengeSelectFi
 .endif

-.if version == 1
+.if version == 0
 .fn isChangeState__Q28Morimura16TChallengeSelectFi, global
 /* 80392870 0038F7B0  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 80392874 0038F7B4  7C 08 02 A6 */	mflr r0
--- a/asm/plugProjectMorimuraU/zukan2D.s
+++ b/asm/plugProjectMorimuraU/zukan2D.s
@ -10460,7 +10460,7 @@ lbl_constructor:
 /* 80378E6C 00375DAC  4E 80 00 20 */	blr 
 .endfn getIdMax__Q28Morimura10TItemZukanFv

-.if version == 1
+.if version == 0
 .fn doCreate__Q28Morimura10TItemZukanFP10JKRArchive, global
 /* 80378E70 00375DB0  94 21 FF 30 */	stwu r1, -0xd0(r1)
 /* 80378E74 00375DB4  7C 08 02 A6 */	mflr r0
@ -14052,7 +14052,7 @@ lbl_constructor:
 /* 8037ACB0 00377BF0  4E 80 00 20 */	blr 
 .endfn doDemoDraw__Q28Morimura10TItemZukanFR8Graphics

-.if version == 1
+.if version == 0
 .fn setDetail__Q28Morimura10TItemZukanFv, global
 /* 8037ACB4 00377BF4  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8037ACB8 00377BF8  7C 08 02 A6 */	mflr r0
@ -14878,7 +14878,7 @@ lbl_constructor:
 /* 8037B6A0 003785E0  4E 80 00 20 */	blr 
 .endfn __ct__Q28Morimura18TCallbackScrollMsgFv

-.if version == 1
+.if version == 0
 .fn doInit__Q28Morimura18TCallbackScrollMsgFv, global
 /* 8037B6A4 003785E4  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8037B6A8 003785E8  7C 08 02 A6 */	mflr r0
@ -15100,7 +15100,7 @@ lbl_constructor:
 /* 8037B930 00378870  4E 80 00 20 */	blr 
 .endfn __ct__Q28Morimura12TZukanWindowFP10JKRArchivei

-.if version == 1
+.if version == 0
 .fn create__Q28Morimura12TZukanWindowFPCcUl, global
 /* 8037B934 00378874  94 21 FF C0 */	stwu r1, -0x40(r1)
 /* 8037B938 00378878  7C 08 02 A6 */	mflr r0
@ -16270,7 +16270,7 @@ lbl_constructor:
 /* 8037C508 00379448  4E 80 00 20 */	blr 
 .endfn setIconColor__Q28Morimura12TZukanWindowFR13J2DGXColorS10R13J2DGXColorS10

-.if version == 1
+.if version == 0
 .fn onIcon__Q28Morimura12TZukanWindowFi, global
 /* 8037C50C 0037944C  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8037C510 00379450  7C 08 02 A6 */	mflr r0
--- a/asm/sysGCU/bootSection.s
+++ b/asm/sysGCU/bootSection.s
@ -134,7 +134,7 @@ lbl_constructor:
 	.4byte .L_8044896C
 	.4byte .L_8044896C
 .endobj lbl_804ED010
-.if version == 1
+.if version == 0
 .obj lbl_804ED03C, local
 	.4byte .L_80449068
 	.4byte .L_80449074
@ -426,7 +426,7 @@ lbl_constructor:
 .obj lbl_80520A6C, local
 	.float 112.0
 .endobj lbl_80520A6C
-.if version == 2
+.if version == 4
 .obj lbl_80520A70, local
 	.float 608.0
 .endobj lbl_80520A70
@ -457,7 +457,7 @@ lbl_constructor:
 /* 804473E8 00444328  4E 80 00 20 */	blr 
 .endfn __ct__10TinyPikminFv

-.if version == 1
+.if version == 0
 .fn update__10TinyPikminFv, global
 /* 804473EC 0044432C  94 21 FF D0 */	stwu r1, -0x30(r1)
 /* 804473F0 00444330  7C 08 02 A6 */	mflr r0
@ -1445,7 +1445,7 @@ lbl_constructor:
 /* 80447D68 00444CA8  4E 80 00 20 */	blr 
 .endfn init__13TinyPikminMgrFv

-.if version == 1
+.if version == 0
 .fn __ct__11BootSectionFP7JKRHeap, global
 /* 80447D6C 00444CAC  94 21 FF C0 */	stwu r1, -0x40(r1)
 /* 80447D70 00444CB0  7C 08 02 A6 */	mflr r0
@ -1895,7 +1895,7 @@ lbl_constructor:
 .endfn __ct__11BootSectionFP7JKRHeap
 .endif

-.if version == 1
+.if version == 0
 .fn __dt__11BootSectionFv, global
 /* 804480B4 00444FF4  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 804480B8 00444FF8  7C 08 02 A6 */	mflr r0
@ -1977,7 +1977,7 @@ lbl_constructor:
 /* 80448138 00445078  4E 80 00 20 */	blr 
 .endfn init__11BootSectionFv

-.if version == 1
+.if version == 0
 .fn loadBootResource__11BootSectionFv, global
 /* 8044813C 0044507C  94 21 FE C0 */	stwu r1, -0x140(r1)
 /* 80448140 00445080  7C 08 02 A6 */	mflr r0
@ -2359,7 +2359,7 @@ lbl_constructor:
 .endfn loadBootResource__11BootSectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn load2DResource__11BootSectionFv, global
 /* 804483F4 00445334  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 804483F8 00445338  7C 08 02 A6 */	mflr r0
@ -2705,7 +2705,7 @@ lbl_constructor:
 /* 804487F0 00445730  4E 80 00 20 */	blr 
 .endfn loadResident__11BootSectionFv

-.if version == 1
+.if version == 0
 .fn doDraw__11BootSectionFR8Graphics, global
 /* 804487F4 00445734  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 804487F8 00445738  7C 08 02 A6 */	mflr r0
@ -2966,7 +2966,7 @@ lbl_constructor:
 /* 804489EC 0044592C  4E 80 00 20 */	blr 
 .endfn drawSetInterlace__11BootSectionFR8Graphics

-.if version == 1
+.if version == 0
 .fn drawNintendoLogo__11BootSectionFR8Graphics, global
 /* 804489F0 00445930  94 21 FE 20 */	stwu r1, -0x1e0(r1)
 /* 804489F4 00445934  7C 08 02 A6 */	mflr r0
@ -3496,7 +3496,7 @@ lbl_constructor:
 .endfn drawNintendoLogo__11BootSectionFR8Graphics
 .endif

-.if version == 1
+.if version == 0
 .fn drawDolbyLogo__11BootSectionFR8Graphics, global
 /* 80448DD0 00445D10  94 21 FE 80 */	stwu r1, -0x180(r1)
 /* 80448DD4 00445D14  7C 08 02 A6 */	mflr r0
@ -3594,7 +3594,7 @@ lbl_constructor:
 .endfn drawDolbyLogo__11BootSectionFR8Graphics
 .endif

-.if version == 2
+.if version == 4
 .fn drawEpilepsy__11BootSectionFR8Graphics, global
 /* 80448E84 00445DC4  94 21 FD 00 */	stwu r1, -0x300(r1)
 /* 80448E88 00445DC8  7C 08 02 A6 */	mflr r0
@ -3701,7 +3701,7 @@ lbl_constructor:
 .endfn drawEpilepsy__11BootSectionFR8Graphics
 .endif

-.if version == 1
+.if version == 0
 .fn doUpdate__11BootSectionFv, global
 /* 80448FF4 00445F34  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 80448FF8 00445F38  7C 08 02 A6 */	mflr r0
@ -4522,7 +4522,7 @@ lbl_constructor:
 .endfn doUpdate__11BootSectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn updateLoadResourceFirst__11BootSectionFv, global
 /* 804494C8 00446408  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 804494CC 0044640C  7C 08 02 A6 */	mflr r0
@ -4738,7 +4738,7 @@ lbl_constructor:
 /* 80449874 004467B4  4E 80 00 20 */	blr 
 .endfn updateLoadMemoryCard__11BootSectionFv

-.if version == 1
+.if version == 0
 .fn updateNintendoLogo__11BootSectionFv, global
 /* 80449878 004467B8  94 21 FF D0 */	stwu r1, -0x30(r1)
 /* 8044987C 004467BC  7C 08 02 A6 */	mflr r0
@ -5098,7 +5098,7 @@ lbl_constructor:
 .endfn updateNintendoLogo__11BootSectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn updateProgressive__11BootSectionFv, global
 /* 80449B00 00446A40  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 80449B04 00446A44  7C 08 02 A6 */	mflr r0
@ -5320,7 +5320,7 @@ lbl_constructor:
 .endfn updateProgressive__11BootSectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn updateWaitProgressive__11BootSectionFv, global
 /* 80449C80 00446BC0  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 80449C84 00446BC4  7C 08 02 A6 */	mflr r0
@ -5380,7 +5380,7 @@ lbl_constructor:
 .endfn updateWaitProgressive__11BootSectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn run__11BootSectionFv, global
 /* 80449CE4 00446C24  94 21 FF C0 */	stwu r1, -0x40(r1)
 /* 80449CE8 00446C28  7C 08 02 A6 */	mflr r0
@ -5593,7 +5593,7 @@ lbl_constructor:
 /* 80449ECC 00446E0C  4E 80 00 20 */	blr 
 .endfn waitLoadResource__11BootSectionFv

-.if version == 1
+.if version == 0
 .fn setMode__11BootSectionFi, global
 /* 80449ED0 00446E10  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 80449ED4 00446E14  7C 08 02 A6 */	mflr r0
@ -5671,7 +5671,7 @@ lbl_constructor:
 .endfn setMode__11BootSectionFi
 .endif

-.if version == 1
+.if version == 0
 .fn setModeEpilepsy__11BootSectionFv, global
 /* 80449F54 00446E94  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 80449F58 00446E98  7C 08 02 A6 */	mflr r0
--- a/asm/sysGCU/section.s
+++ b/asm/sysGCU/section.s
@ -85,7 +85,7 @@ lbl_constructor:
 .obj lbl_80520440, local
 	.float 0.5
 .endobj lbl_80520440
-.if version == 1
+.if version == 0
 .obj lbl_80520444, local
 	.float 0.0
 .endobj lbl_80520444
@ -109,7 +109,7 @@ lbl_constructor:
 	.asciz "update"
 .endobj lbl_80520454
 .balign 4
-.if version == 1
+.if version == 0
 .obj lbl_8052045C, local
 	.float 180.0
 .endobj lbl_8052045C
@ -124,7 +124,7 @@ lbl_constructor:
 /* 80423770 004206B0  4E 80 00 20 */	blr 
 .endfn init__7SectionFv

-.if version == 1
+.if version == 0
 .fn __ct__7SectionFP10JFWDisplayP7JKRHeapb, global
 /* 804237F0 00420730  94 21 FF D0 */	stwu r1, -0x30(r1)
 /* 804237F4 00420734  7C 08 02 A6 */	mflr r0
@ -507,7 +507,7 @@ lbl_constructor:
 /* 80423AC0 00420A00  4E 80 00 20 */	blr 
 .endfn __dt__7SectionFv

-.if version == 1
+.if version == 0
 .fn run__7SectionFv, global
 /* 80423B94 00420AD4  94 21 FF C0 */	stwu r1, -0x40(r1)
 /* 80423B98 00420AD8  7C 08 02 A6 */	mflr r0
--- a/asm/sysGCU/titleSection.s
+++ b/asm/sysGCU/titleSection.s
@ -277,7 +277,7 @@ lbl_constructor:
 .endobj lbl_80520AA4

 .section .text, "ax"  # 0x800056C0 - 0x80472F00
-.if version == 1
+.if version == 0
 .fn __ct__Q25Title7SectionFP7JKRHeap, global
 /* 8044A03C 00446F7C  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8044A040 00446F80  7C 08 02 A6 */	mflr r0
@ -631,7 +631,7 @@ lbl_constructor:
 /* 8044A45C 0044739C  4E 80 00 20 */	blr 
 .endfn __dt__Q23ebi13TMainTitleMgrFv

-.if version == 1
+.if version == 0
 .fn __dt__Q25Title7SectionFv, global
 /* 8044A460 004473A0  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8044A464 004473A4  7C 08 02 A6 */	mflr r0
@ -725,7 +725,7 @@ lbl_constructor:
 .endfn __dt__Q25Title7SectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn doExit__Q25Title7SectionFv, global
 /* 8044A504 00447444  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8044A508 00447448  7C 08 02 A6 */	mflr r0
@ -837,7 +837,7 @@ lbl_constructor:
 .endfn doExit__Q25Title7SectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn loadResident__Q25Title7SectionFv, global
 /* 8044A5C8 00447508  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8044A5CC 0044750C  7C 08 02 A6 */	mflr r0
@ -981,7 +981,7 @@ lbl_constructor:
 .endfn loadResident__Q25Title7SectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn init__Q25Title7SectionFv, global
 /* 8044A6CC 0044760C  94 21 FF B0 */	stwu r1, -0x50(r1)
 /* 8044A6D0 00447610  7C 08 02 A6 */	mflr r0
@ -1601,7 +1601,7 @@ lbl_constructor:
 /* 8044AB7C 00447ABC  4E 80 00 20 */	blr 
 .endfn menuSelect__Q25Title7SectionFR4Menu

-.if version == 1
+.if version == 0
 .fn doDraw__Q25Title7SectionFR8Graphics, global
 /* 8044AB80 00447AC0  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8044AB84 00447AC4  7C 08 02 A6 */	mflr r0
@ -1759,7 +1759,7 @@ lbl_constructor:
 .endfn doDraw__Q25Title7SectionFR8Graphics
 .endif

-.if version == 1
+.if version == 0
 .fn doUpdateMainTitle__Q25Title7SectionFv, global
 /* 8044AC90 00447BD0  94 21 FF D0 */	stwu r1, -0x30(r1)
 /* 8044AC94 00447BD4  7C 08 02 A6 */	mflr r0
@ -2687,7 +2687,7 @@ lbl_constructor:
 .endfn doUpdateMainTitle__Q25Title7SectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn doUpdateOmake__Q25Title7SectionFv, global
 /* 8044B318 00448258  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8044B31C 0044825C  7C 08 02 A6 */	mflr r0
@ -3443,7 +3443,7 @@ lbl_constructor:
 /* 8044B8E4 00448824  4E 80 00 20 */	blr 
 .endfn run__Q25Title7SectionFv

-.if version == 1
+.if version == 0
 .fn doUpdate__Q25Title7SectionFv, global
 /* 8044B8E8 00448828  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8044B8EC 0044882C  7C 08 02 A6 */	mflr r0
@ -4255,7 +4255,7 @@ lbl_constructor:
 .endfn doUpdate__Q25Title7SectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn isFinishable__Q25Title7SectionFv, global
 /* 8044BEA0 00448DE0  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 8044BEA4 00448DE4  7C 08 02 A6 */	mflr r0
@ -4295,7 +4295,7 @@ lbl_constructor:
 .endfn isFinishable__Q25Title7SectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn doLoadingStart__Q25Title7SectionFv, global
 /* 8044BEE0 00448E20  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8044BEE4 00448E24  7C 08 02 A6 */	mflr r0
@ -4375,7 +4375,7 @@ lbl_constructor:
 .endfn doLoadingStart__Q25Title7SectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn doLoading__Q25Title7SectionFv, global
 /* 8044BF6C 00448EAC  94 21 FF E0 */	stwu r1, -0x20(r1)
 /* 8044BF70 00448EB0  7C 08 02 A6 */	mflr r0
@ -4509,7 +4509,7 @@ lbl_constructor:
 .endfn doLoading__Q25Title7SectionFv
 .endif

-.if version == 1
+.if version == 0
 .fn loadResource__Q25Title7SectionFv, global
 /* 8044C058 00448F98  94 21 FF 60 */	stwu r1, -0xa0(r1)
 /* 8044C05C 00448F9C  7C 08 02 A6 */	mflr r0
--- a/assets/dolphin-extract.png
+++ b/assets/dolphin-extract.png
--- a/assets/objdiff.png
+++ b/assets/objdiff.png
--- a/config/GPVE01/build.sha1
+++ b/config/GPVE01/build.sha1
@ -0,0 +1 @@
+90d328bf8f190c90472e8c19e7e53c6ad0fe0d1a  build/GPVE01/main.dol
--- a/config/GPVE01/config.yml
+++ b/config/GPVE01/config.yml
@ -0,0 +1,10 @@
+object: orig/GPVE01/sys/main.dol
+hash: 90d328bf8f190c90472e8c19e7e53c6ad0fe0d1a
+
+# Generated from pikmin2UP.MAP
+symbols: config/GPVE01/symbols.txt
+splits: config/GPVE01/splits.txt
+
+mw_comment_version: 10 # GC Linker 2.6
+symbols_known: true # Very fast analysis
+fill_gaps: false # Alignments known
--- a/config/GPVE01/splits.txt
+++ b/config/GPVE01/splits.txt
--- a/config/GPVE01/symbols.txt
+++ b/config/GPVE01/symbols.txt
--- a/config/GPVE01_D17/build.sha1
+++ b/config/GPVE01_D17/build.sha1
@ -0,0 +1 @@
+3730939092688902af4866be66d4a8404ae752c7  build/GPVE01_D17/main.dol
--- a/config/GPVE01_D17/config.yml
+++ b/config/GPVE01_D17/config.yml
@ -0,0 +1,10 @@
+object: orig/GPVE01_D17/sys/main.dol
+hash: 3730939092688902af4866be66d4a8404ae752c7
+
+# Generated from pikmin2UP.MAP
+symbols: config/GPVE01_D17/symbols.txt
+splits: config/GPVE01_D17/splits.txt
+
+mw_comment_version: 10 # GC Linker 2.6
+symbols_known: true # Very fast analysis
+fill_gaps: false # Alignments known
--- a/config/GPVE01_D17/splits.txt
+++ b/config/GPVE01_D17/splits.txt
--- a/config/GPVE01_D17/symbols.txt
+++ b/config/GPVE01_D17/symbols.txt
--- a/configure.py
+++ b/configure.py
--- a/include/BuildSettings.h
+++ b/include/BuildSettings.h
@ -8,8 +8,8 @@
 #define BUGFIX      false
 #define FOR_MODDING false

-#define USADEMO1 1
-#define USAFINAL 2
+#define USADEMO1 0
+#define USAFINAL 4

 #if VERNUM == USAFINAL
 #define BUILDTARGET USAFINAL
--- a/include/CellMgrParms.h
+++ b/include/CellMgrParms.h
@ -7,8 +7,8 @@

 struct _CellParms {
 	inline _CellParms(Parameters* parameters)
-	    : mUseBuffer(parameters, 'p000', "バッファを使う", false, false, true)    // 'use a buffer'
-	    , mMagicNumber(parameters, 'p001', "マジックナンバー", true, false, true) // 'magic number'
+	    : mUseBuffer(parameters, 'p000', "バッファを使う", false, false, true)    // 'use a buffer'
+	    , mMagicNumber(parameters, 'p001', "マジックナンバー", true, false, true) // 'magic number'
 	    , mHalfG(parameters, 'p002', "G-Half", false, false, true)
 	    , mUpdateMgr(parameters, 'p003', "UpdateMgr", false, false, true)
 	{
--- a/include/Demo.h
+++ b/include/Demo.h
@ -16,7 +16,7 @@ struct HIORootNode : public Game::HIORootNode {
 	HIORootNode(Section* section)
 	    : Game::HIORootNode(section)
 	{
-		mName = "THPセクション";
+		mName = "THPセクション";
 	}

 	virtual ~HIORootNode() { } // _08 (weak)
--- a/include/Game/CPlate.h
+++ b/include/Game/CPlate.h
@ -33,9 +33,9 @@ struct CPlate : public Container<Creature> {
 	struct Parms : public Parameters {
 		inline Parms()
 		    : Parameters(nullptr, "Navi::Parms")
-		    , mStartingOffset(this, 'p000', "先頭オフセット", 17.5f, 0.0f, 100.0f)          // 'starting offset'
-		    , mLengthLimit(this, 'p001', "長さリミット", 130.0f, 10.0f, 1000.0f)            // 'length limit'
-		    , mMaxPositionSize(this, 'p002', "ポジションの大きさ(最大)", 6.0f, 1.0f, 50.0f) // 'position size (max)'
+		    , mStartingOffset(this, 'p000', "先頭オフセット", 17.5f, 0.0f, 100.0f)          // 'starting offset'
+		    , mLengthLimit(this, 'p001', "長さリミット", 130.0f, 10.0f, 1000.0f)            // 'length limit'
+		    , mMaxPositionSize(this, 'p002', "ポジションの大きさ(最大)", 6.0f, 1.0f, 50.0f) // 'position size (max)'
 		{
 		}
 		Parm<f32> mStartingOffset;  // _0C
--- a/include/Game/CameraMgr.h
+++ b/include/Game/CameraMgr.h
@ -131,67 +131,67 @@ struct CameraData {
 struct CameraParms : public Parameters {
 	CameraParms()
 	    : Parameters(nullptr, "CameraParms")
-	    , mNearLowDist(this, 'cnld', "Near(Low)距離", 600.0f, 10.0f, 5000.0f)          // 'near(low) distance'
-	    , mNearLowAngle(this, 'cnla', "Near(Low)アングル", 20.0f, 0.0f, 90.0f)         // 'near(low) angle'
-	    , mNearLowFOV(this, 'cnlf', "Near(Low)ＦＯＶ", 10.0f, 1.0f, 60.0f)             // 'near(low) fov'
-	    , mNearLowOffset(this, 'cnlo', "Near(Low)オフセット", 25.0f, 10.0f, 500.0f)    // 'near(low) offset'
-	    , mNearLowWeight(this, 'cnlw', "Near(Low)ウェイト", 1000.0f, 10.0f, 5000.0f)   // 'near(low) weight'
+	    , mNearLowDist(this, 'cnld', "Near(Low)距離", 600.0f, 10.0f, 5000.0f)          // 'near(low) distance'
+	    , mNearLowAngle(this, 'cnla', "Near(Low)アングル", 20.0f, 0.0f, 90.0f)         // 'near(low) angle'
+	    , mNearLowFOV(this, 'cnlf', "Near(Low)ＦＯＶ", 10.0f, 1.0f, 60.0f)             // 'near(low) fov'
+	    , mNearLowOffset(this, 'cnlo', "Near(Low)オフセット", 25.0f, 10.0f, 500.0f)    // 'near(low) offset'
+	    , mNearLowWeight(this, 'cnlw', "Near(Low)ウェイト", 1000.0f, 10.0f, 5000.0f)   // 'near(low) weight'
 	    , mNearLowDetached(this, 'nldt', "Near(Low)Detached", 17.5f, 0.0f, 1000.0f)    // 'near(low) detached'
 	    , mNearLowNear(this, 'nlnc', "Near(Low)Near", 1.0f, 1.0f, 12800.0f)            // 'near(low) near'
 	    , mNearLowFar(this, 'nlfc', "Near(Low)Far", 12800.0f, 1.0f, 12800.0f)          // 'near(low) far'
-	    , mMidLowDist(this, 'cmld', "Mid(Low)距離", 600.0f, 10.0f, 5000.0f)            // 'mid(low) distance'
-	    , mMidLowAngle(this, 'cmla', "Mid(Low)アングル", 21.0f, 0.0f, 90.0f)           // 'mid(low) angle'
-	    , mMidLowFOV(this, 'cmlf', "Mid(Low)ＦＯＶ", 23.0f, 1.0f, 60.0f)               // 'mid(low) fov'
-	    , mMidLowOffset(this, 'cmlo', "Mid(Low)オフセット", 38.0f, 10.0f, 500.0f)      // 'mid(low) offset'
-	    , mMidLowWeight(this, 'cmlw', "Mid(Low)ウェイト", 500.0f, 10.0f, 5000.0f)      // 'mid(low) weight'
+	    , mMidLowDist(this, 'cmld', "Mid(Low)距離", 600.0f, 10.0f, 5000.0f)            // 'mid(low) distance'
+	    , mMidLowAngle(this, 'cmla', "Mid(Low)アングル", 21.0f, 0.0f, 90.0f)           // 'mid(low) angle'
+	    , mMidLowFOV(this, 'cmlf', "Mid(Low)ＦＯＶ", 23.0f, 1.0f, 60.0f)               // 'mid(low) fov'
+	    , mMidLowOffset(this, 'cmlo', "Mid(Low)オフセット", 38.0f, 10.0f, 500.0f)      // 'mid(low) offset'
+	    , mMidLowWeight(this, 'cmlw', "Mid(Low)ウェイト", 500.0f, 10.0f, 5000.0f)      // 'mid(low) weight'
 	    , mMidLowDetached(this, 'mldt', "Mid(Low)Detached", 55.0f, 0.0f, 1000.0f)      // 'mid(low) detached'
 	    , mMidLowNear(this, 'mlnc', "Mid(Low)Near", 1.0f, 1.0f, 12800.0f)              // 'mid(low) near'
 	    , mMidLowFar(this, 'mlfc', "Mid(Low)Far", 12800.0f, 1.0f, 12800.0f)            // 'mid(low) far'
-	    , mFarLowDist(this, 'cfld', "Far(Low)距離", 900.0f, 10.0f, 5000.0f)            // 'far(low) distance'
-	    , mFarLowAngle(this, 'cfla', "Far(Low)アングル", 25.0f, 0.0f, 90.0f)           // 'far(low) angle'
-	    , mFarLowFOV(this, 'cflf', "Far(Low)ＦＯＶ", 26.0f, 1.0f, 60.0f)               // 'far(low) fov'
-	    , mFarLowOffset(this, 'cflo', "Far(Low)オフセット", 33.0f, 10.0f, 500.0f)      // 'far(low) offset'
-	    , mFarLowWeight(this, 'cflw', "Far(Low)ウェイト", 400.0f, 10.0f, 5000.0f)      // 'far(low) weight'
+	    , mFarLowDist(this, 'cfld', "Far(Low)距離", 900.0f, 10.0f, 5000.0f)            // 'far(low) distance'
+	    , mFarLowAngle(this, 'cfla', "Far(Low)アングル", 25.0f, 0.0f, 90.0f)           // 'far(low) angle'
+	    , mFarLowFOV(this, 'cflf', "Far(Low)ＦＯＶ", 26.0f, 1.0f, 60.0f)               // 'far(low) fov'
+	    , mFarLowOffset(this, 'cflo', "Far(Low)オフセット", 33.0f, 10.0f, 500.0f)      // 'far(low) offset'
+	    , mFarLowWeight(this, 'cflw', "Far(Low)ウェイト", 400.0f, 10.0f, 5000.0f)      // 'far(low) weight'
 	    , mFarLowDetached(this, 'fldt', "Far(Low)Detached", 130.0f, 0.0f, 1000.0f)     // 'far(low) detached'
 	    , mFarLowNear(this, 'flnc', "Far(Low)Near", 1.0f, 1.0f, 12800.0f)              // 'far(low) near'
 	    , mFarLowFar(this, 'flfc', "Far(Low)Far", 12800.0f, 1.0f, 12800.0f)            // 'far(low) far'
-	    , mNearHighDist(this, 'cnhd', "Near(High)距離", 900.0f, 10.0f, 5000.0f)        // 'near(high) distance'
-	    , mNearHighAngle(this, 'cnha', "Near(High)アングル", 60.0f, 0.0f, 90.0f)       // 'near(high) angle'
-	    , mNearHighFOV(this, 'cnhf', "Near(High)ＦＯＶ", 10.0f, 1.0f, 60.0f)           // 'near(high) fov'
-	    , mNearHighOffset(this, 'cnho', "Near(High)オフセット", 40.0f, 10.0f, 500.0f)  // 'near(high) offset'
-	    , mNearHighWeight(this, 'cnhw', "Near(High)ウェイト", 1000.0f, 10.0f, 5000.0f) // 'near(high) weight'
+	    , mNearHighDist(this, 'cnhd', "Near(High)距離", 900.0f, 10.0f, 5000.0f)        // 'near(high) distance'
+	    , mNearHighAngle(this, 'cnha', "Near(High)アングル", 60.0f, 0.0f, 90.0f)       // 'near(high) angle'
+	    , mNearHighFOV(this, 'cnhf', "Near(High)ＦＯＶ", 10.0f, 1.0f, 60.0f)           // 'near(high) fov'
+	    , mNearHighOffset(this, 'cnho', "Near(High)オフセット", 40.0f, 10.0f, 500.0f)  // 'near(high) offset'
+	    , mNearHighWeight(this, 'cnhw', "Near(High)ウェイト", 1000.0f, 10.0f, 5000.0f) // 'near(high) weight'
 	    , mNearHighDetached(this, 'nhdt', "Near(High)Detached", 27.5f, 0.0f, 1000.0f)  // 'near(high) detached'
 	    , mNearHighNear(this, 'nhnc', "Near(High)Near", 1.0f, 1.0f, 12800.0f)          // 'near(high) near'
 	    , mNearHighFar(this, 'nhfc', "Near(High)Far", 12800.0f, 1.0f, 12800.0f)        // 'near(high) far'
-	    , mMidHighDist(this, 'cmhd', "Mid(High)距離", 900.0f, 10.0f, 5000.0f)          // 'mid(high) distance'
-	    , mMidHighAngle(this, 'cmha', "Mid(High)アングル", 60.0f, 0.0f, 90.0f)         // 'mid(high) angle'
-	    , mMidHighFOV(this, 'cmhf', "Mid(High)ＦＯＶ", 20.0f, 1.0f, 60.0f)             // 'mid(high) fov'
-	    , mMidHighOffset(this, 'cmho', "Mid(High)オフセット", 70.0f, 10.0f, 500.0f)    // 'mid(high) offset'
-	    , mMidHighWeight(this, 'cmhw', "Mid(High)ウェイト", 500.0f, 10.0f, 5000.0f)    // 'mid(high) weight'
+	    , mMidHighDist(this, 'cmhd', "Mid(High)距離", 900.0f, 10.0f, 5000.0f)          // 'mid(high) distance'
+	    , mMidHighAngle(this, 'cmha', "Mid(High)アングル", 60.0f, 0.0f, 90.0f)         // 'mid(high) angle'
+	    , mMidHighFOV(this, 'cmhf', "Mid(High)ＦＯＶ", 20.0f, 1.0f, 60.0f)             // 'mid(high) fov'
+	    , mMidHighOffset(this, 'cmho', "Mid(High)オフセット", 70.0f, 10.0f, 500.0f)    // 'mid(high) offset'
+	    , mMidHighWeight(this, 'cmhw', "Mid(High)ウェイト", 500.0f, 10.0f, 5000.0f)    // 'mid(high) weight'
 	    , mMidHighDetached(this, 'mhdt', "Mid(High)Detached", 75.0f, 0.0f, 1000.0f)    // 'mid(high) detached'
 	    , mMidHighNear(this, 'mhnc', "Mid(High)Near", 1.0f, 1.0f, 12800.0f)            // 'mid(high) near'
 	    , mMidHighFar(this, 'mhfc', "Mid(High)Far", 12800.0f, 1.0f, 12800.0f)          // 'mid(high) far'
-	    , mFarHighDist(this, 'cfhd', "Far(High)距離", 1200.0f, 10.0f, 5000.0f)         // 'far(high) distance'
-	    , mFarHighAngle(this, 'cfha', "Far(High)アングル", 60.0f, 0.0f, 90.0f)         // 'far(high) angle'
-	    , mFarHighFOV(this, 'cfhf', "Far(High)ＦＯＶ", 30.0f, 1.0f, 60.0f)             // 'far(high) fov'
-	    , mFarHighOffset(this, 'cfho', "Far(High)オフセット", 100.0f, 10.0f, 500.0f)   // 'far(high) offset'
-	    , mFarHighWeight(this, 'cfhw', "Far(High)ウェイト", 200.0f, 10.0f, 5000.0f)    // 'far(high) weight'
+	    , mFarHighDist(this, 'cfhd', "Far(High)距離", 1200.0f, 10.0f, 5000.0f)         // 'far(high) distance'
+	    , mFarHighAngle(this, 'cfha', "Far(High)アングル", 60.0f, 0.0f, 90.0f)         // 'far(high) angle'
+	    , mFarHighFOV(this, 'cfhf', "Far(High)ＦＯＶ", 30.0f, 1.0f, 60.0f)             // 'far(high) fov'
+	    , mFarHighOffset(this, 'cfho', "Far(High)オフセット", 100.0f, 10.0f, 500.0f)   // 'far(high) offset'
+	    , mFarHighWeight(this, 'cfhw', "Far(High)ウェイト", 200.0f, 10.0f, 5000.0f)    // 'far(high) weight'
 	    , mFarHighDetached(this, 'fhdt', "Far(High)Detached", 165.0f, 0.0f, 1000.0f)   // 'far(high) detached'
 	    , mFarHighNear(this, 'fhnc', "Far(High)Near", 1.0f, 1.0f, 12800.0f)            // 'far(high) near'
 	    , mFarHighFar(this, 'fhfc', "Far(High)Far", 12800.0f, 1.0f, 12800.0f)          // 'far(high) far'
-	    , mZoomDist(this, 'zmdt', "ZOOM 距離", 250.0f, 10.0f, 5000.0f)                 // 'ZOOM distance'
-	    , mZoomAngle(this, 'zman', "ZOOM アングル", 12.0f, 0.0f, 90.0f)                // 'ZOOM angle'
-	    , mZoomFOV(this, 'zmfv', "ZOOM ＦＯＶ", 35.0f, 1.0f, 60.0f)                    // 'ZOOM fov'
-	    , mCollRadius(this, 'clcr', "コリジョン半径", 300.0f, 0.0f, 500.0f)            // 'collision radius'
-	    , mCollInterpSpeed(this, 'clms', "コリジョン補間速度", 0.005f, 0.001f, 1.0f)   // 'collision interpolation speed'
-	    , mCollCorrHeight(this, 'clmh', "コリジョン補正高", 5.0f, 0.0f, 100.0f)        // 'collision correction height'
-	    , mNoCollHeight(this, 'clnh', "コリジョン無し高", 25.0f, 0.0f, 500.0f)         // 'no collision height'
-	    , mSettingChangeSpeed(this, 'cpmd', "設定変更速度", 0.1f, 0.0f, 1.0f)          // 'setting change speed'
-	    , mRotSpeed(this, 'cmmt', "回転速度", 0.2f, 0.0f, 1.0f)                        // 'rotation speed'
-	    , mRotFollowTime(this, 'cmft', "回転追従時間", 0.6f, 0.0f, 3.0f)               // 'rotation follow time'
-	    , mRotAccel(this, 'cmta', "回転加速度", 0.005f, 0.0f, 1.0f)                    // 'rotation acceleration'
-	    , mMaxRotSpeed(this, 'cmtm', "回転最高速度", 0.9f, 0.0f, 5.0f)                 // 'max rotation speed'
-	    , mRotDampRate(this, 'cmtb', "回転減衰率", 0.85f, 0.0f, 1.0f)                  // 'rotation damping rate'
+	    , mZoomDist(this, 'zmdt', "ZOOM 距離", 250.0f, 10.0f, 5000.0f)                 // 'ZOOM distance'
+	    , mZoomAngle(this, 'zman', "ZOOM アングル", 12.0f, 0.0f, 90.0f)                // 'ZOOM angle'
+	    , mZoomFOV(this, 'zmfv', "ZOOM ＦＯＶ", 35.0f, 1.0f, 60.0f)                    // 'ZOOM fov'
+	    , mCollRadius(this, 'clcr', "コリジョン半径", 300.0f, 0.0f, 500.0f)            // 'collision radius'
+	    , mCollInterpSpeed(this, 'clms', "コリジョン補間速度", 0.005f, 0.001f, 1.0f)   // 'collision interpolation speed'
+	    , mCollCorrHeight(this, 'clmh', "コリジョン補正高", 5.0f, 0.0f, 100.0f)        // 'collision correction height'
+	    , mNoCollHeight(this, 'clnh', "コリジョン無し高", 25.0f, 0.0f, 500.0f)         // 'no collision height'
+	    , mSettingChangeSpeed(this, 'cpmd', "設定変更速度", 0.1f, 0.0f, 1.0f)          // 'setting change speed'
+	    , mRotSpeed(this, 'cmmt', "回転速度", 0.2f, 0.0f, 1.0f)                        // 'rotation speed'
+	    , mRotFollowTime(this, 'cmft', "回転追従時間", 0.6f, 0.0f, 3.0f)               // 'rotation follow time'
+	    , mRotAccel(this, 'cmta', "回転加速度", 0.005f, 0.0f, 1.0f)                    // 'rotation acceleration'
+	    , mMaxRotSpeed(this, 'cmtm', "回転最高速度", 0.9f, 0.0f, 5.0f)                 // 'max rotation speed'
+	    , mRotDampRate(this, 'cmtb', "回転減衰率", 0.85f, 0.0f, 1.0f)                  // 'rotation damping rate'
 	{
 	}

--- a/include/Game/Cave/Info.h
+++ b/include/Game/Cave/Info.h
@ -223,7 +223,7 @@ struct CaveInfo : public CNode {
 	struct Parms : Parameters {
 		inline Parms()
 		    : Parameters(nullptr, "CaveInfo")
-		    , mFloorMax(this, 'c000', "ŠK‘w", 1, 1, 128) // 'floor'
+		    , mFloorMax(this, 'c000', "階層", 1, 1, 128) // 'floor'
 		{
 		}

--- a/include/Game/EnemyEffectNode.h
+++ b/include/Game/EnemyEffectNode.h
@ -10,7 +10,7 @@ struct EnemyBase;

 struct EnemyEffectNodeBase : public CNode {
 	inline EnemyEffectNodeBase()
-	    : CNode("”g–ä") // ripple
+	    : CNode("波紋") // ripple
 	{
 	}

--- a/include/Game/EnemyParmsBase.h
+++ b/include/Game/EnemyParmsBase.h
@ -52,53 +52,53 @@ struct EnemyParmsBase : public CreatureParms {
 	struct Parms : public Parameters {
 		Parms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mHealth(this, 'fp00', "ライフ", 100.0f, 0.0f, 99999.0f)                     // life
-		    , mLifeMeterHeight(this, 'fp27', "ライフの高さ", 50.0f, 0.0f, 1000.0f)        // height of life
-		    , mRegenerationRate(this, 'fp31', "ライフ回復率", 0.01f, 0.0f, 1.0f)          // life recovery rate
-		    , mLifeBeforeAlert(this, 'fp30', "警戒ライフ", 30.0f, 0.0f, 99999.0f)         // 'vigilant life'
-		    , mHeightOffsetFromFloor(this, 'fp01', "マップとの当り", 40.0f, 0.0f, 100.0f) // 'match with the map'
-		    , mCellRadius(this, 'fp33', "マップとのあたりポリゴンの選定", 40.0f, 0.0f,
+		    , mHealth(this, 'fp00', "ライフ", 100.0f, 0.0f, 99999.0f)                     // life
+		    , mLifeMeterHeight(this, 'fp27', "ライフの高さ", 50.0f, 0.0f, 1000.0f)        // height of life
+		    , mRegenerationRate(this, 'fp31', "ライフ回復率", 0.01f, 0.0f, 1.0f)          // life recovery rate
+		    , mLifeBeforeAlert(this, 'fp30', "警戒ライフ", 30.0f, 0.0f, 99999.0f)         // 'vigilant life'
+		    , mHeightOffsetFromFloor(this, 'fp01', "マップとの当り", 40.0f, 0.0f, 100.0f) // 'match with the map'
+		    , mCellRadius(this, 'fp33', "マップとのあたりポリゴンの選定", 40.0f, 0.0f,
 		                  500.0f)                                                          // 'selection of map-related polygons'
-		    , mPikminDamageRadius(this, 'fp34', "ピクミンとのあたり", 40.0f, 0.0f, 500.0f) // 'about pikmin'
-		    , mOffCameraRadius(this, 'fp32', "LOD半径", 40.0f, 0.0f, 500.0f)               // LOD radius
-		    , mHorizontalDamageScale(this, 'fp02', "ダメージスケールXZ", 0.2f, 0.0f, 1.0f) // damage scale XZ
-		    , mVerticalDamageScale(this, 'fp03', "ダメージスケールY", 0.25f, 0.0f, 1.0f)   // damage scale Y
-		    , mDamageScaleDuration(this, 'fp04', "ダメージフレーム", 0.35f, 0.0f, 1.0f)    // 'damage frame'
-		    , mMass(this, 'fp05', "質量", 1.0f, 0.0f, 100.0f)                              // mass
-		    , mMoveSpeed(this, 'fp06', "速度", 80.0f, 0.0f, 1000.0f)                       // speed
-		    , mTurnSpeed(this, 'fp08', "回転速度率", 0.1f, 0.0f, 1.0f)                     // rotation speed rate
-		    , mMaxTurnAngle(this, 'fp28', "回転最大速度", 10.0f, 0.0f, 360.0f)             // maximum rotation speed
-		    , mTerritoryRadius(this, 'fp09', "テリトリー", 200.0f, 1.0f, 1000.0f)          // territory
-		    , mHomeRadius(this, 'fp10', "ホーム範囲", 15.0f, 1.0f, 1000.0f)                // home range
-		    , mPrivateRadius(this, 'fp11', "プライベート距離", 70.0f, 0.0f, 1000.0f)       // private distance
-		    , mSightRadius(this, 'fp12', "視界距離", 200.0f, 0.0f, 1000.0f)                // sight distance
-		    , mFov(this, 'fp25', "視界高", 50.0f, 0.0f, 1000.0f)                           // visibility height
-		    , mViewAngle(this, 'fp13', "視界角度", 90.0f, 0.0f, 180.0f)                    // view angle
-		    , mSearchDistance(this, 'fp14', "探索距離", 200.0f, 0.0f, 1000.0f)             // search distance
-		    , mSearchHeight(this, 'fp26', "探索高", 50.0f, 0.0f, 1000.0f)                  // search height
-		    , mSearchAngle(this, 'fp15', "探索角度", 120.0f, 0.0f, 180.0f)                 // search angle
-		    , mShakeKnockback(this, 'fp17', "振り払い力", 300.0f, 0.0f, 1000.0f)           // shake off power
-		    , mShakeDamage(this, 'fp18', "振り払いダメージ", 0.0f, 0.0f, 1000.0f)          // shake off damage
-		    , mShakeRange(this, 'fp19', "振り払い範囲", 120.0f, 0.0f, 1000.0f)             // shake off range
-		    , mShakeChance(this, 'fp16', "振り払い率", 1.0f, 0.0f, 1.0f)                   // shake off rate
-		    , mMaxAttackRange(this, 'fp20', "攻撃可能\範囲", 70.0f, 0.0f, 1000.0f)         // attack range - SHIFT-JIS IS WRONG
-		    , mMaxAttackAngle(this, 'fp21', "攻撃可能\角度", 15.0f, 0.0f,
+		    , mPikminDamageRadius(this, 'fp34', "ピクミンとのあたり", 40.0f, 0.0f, 500.0f) // 'about pikmin'
+		    , mOffCameraRadius(this, 'fp32', "LOD半径", 40.0f, 0.0f, 500.0f)               // LOD radius
+		    , mHorizontalDamageScale(this, 'fp02', "ダメージスケールXZ", 0.2f, 0.0f, 1.0f) // damage scale XZ
+		    , mVerticalDamageScale(this, 'fp03', "ダメージスケールY", 0.25f, 0.0f, 1.0f)   // damage scale Y
+		    , mDamageScaleDuration(this, 'fp04', "ダメージフレーム", 0.35f, 0.0f, 1.0f)    // 'damage frame'
+		    , mMass(this, 'fp05', "質量", 1.0f, 0.0f, 100.0f)                              // mass
+		    , mMoveSpeed(this, 'fp06', "速度", 80.0f, 0.0f, 1000.0f)                       // speed
+		    , mTurnSpeed(this, 'fp08', "回転速度率", 0.1f, 0.0f, 1.0f)                     // rotation speed rate
+		    , mMaxTurnAngle(this, 'fp28', "回転最大速度", 10.0f, 0.0f, 360.0f)             // maximum rotation speed
+		    , mTerritoryRadius(this, 'fp09', "テリトリー", 200.0f, 1.0f, 1000.0f)          // territory
+		    , mHomeRadius(this, 'fp10', "ホーム範囲", 15.0f, 1.0f, 1000.0f)                // home range
+		    , mPrivateRadius(this, 'fp11', "プライベート距離", 70.0f, 0.0f, 1000.0f)       // private distance
+		    , mSightRadius(this, 'fp12', "視界距離", 200.0f, 0.0f, 1000.0f)                // sight distance
+		    , mFov(this, 'fp25', "視界高", 50.0f, 0.0f, 1000.0f)                           // visibility height
+		    , mViewAngle(this, 'fp13', "視界角度", 90.0f, 0.0f, 180.0f)                    // view angle
+		    , mSearchDistance(this, 'fp14', "探索距離", 200.0f, 0.0f, 1000.0f)             // search distance
+		    , mSearchHeight(this, 'fp26', "探索高", 50.0f, 0.0f, 1000.0f)                  // search height
+		    , mSearchAngle(this, 'fp15', "探索角度", 120.0f, 0.0f, 180.0f)                 // search angle
+		    , mShakeKnockback(this, 'fp17', "振り払い力", 300.0f, 0.0f, 1000.0f)           // shake off power
+		    , mShakeDamage(this, 'fp18', "振り払いダメージ", 0.0f, 0.0f, 1000.0f)          // shake off damage
+		    , mShakeRange(this, 'fp19', "振り払い範囲", 120.0f, 0.0f, 1000.0f)             // shake off range
+		    , mShakeChance(this, 'fp16', "振り払い率", 1.0f, 0.0f, 1.0f)                   // shake off rate
+		    , mMaxAttackRange(this, 'fp20', "攻撃可能\範囲", 70.0f, 0.0f, 1000.0f)         // attack range - SHIFT-JIS IS WRONG
+		    , mMaxAttackAngle(this, 'fp21', "攻撃可能\角度", 15.0f, 0.0f,
 		                      180.0f)                                              // 'possible attack angle' - SHIFT-JIS IS WRONG
-		    , mAttackRadius(this, 'fp22', "攻撃ヒット範囲", 70.0f, 0.0f, 1000.0f)  // attack hit range
-		    , mAttackHitAngle(this, 'fp23', "攻撃ヒット角度", 15.0f, 0.0f, 180.0f) // attack hit angle
-		    , mAttackDamage(this, 'fp24', "攻撃力", 10.0f, 0.0f, 1000.0f)          // attack power
-		    , mAlertDuration(this, 'fp29', "警戒時間", 15.0f, 0.0f, 99.0f)         // alert time
-		    , mBitterDuration(this, 'fp35', "石化時間", 1.0f, 0.0f, 60.0f)         // stone time
-		    , mPurplePikiStunDamage(this, 'fp36', "ヒップドロップダメージ", 10.0f, 0.0f, 1000.0f) // hip drop damage
-		    , mPurplePikiStunChance(this, 'fp37', "地震気絶確立", 0.05f, 0.0f, 1.0f)              // earthquake faint probability
-		    , mPurplePikiStunDuration(this, 'fp38', "地震気絶時間", 10.0f, 0.0f, 60.0f)           // earthquake faint time
-		    , mShakeOffBlowA(this, 'ip01', "振り払い打撃Ａ", 3, 0, 200)                           // shake off blow A
-		    , mShakeOffSticking1(this, 'ip02', "振り払い張付１", 3, 0, 100)                       // shake off sticking 1
-		    , mShakeOffBlowB(this, 'ip03', "振り払い打撃Ｂ", 8, 0, 200)                           // shake off blow B
-		    , mShakeOffSticking2(this, 'ip04', "振り払い張付２", 5, 0, 100)                       // shake off sticking 2
-		    , mShakeOffBlowC(this, 'ip05', "振り払い打撃Ｃ", 15, 0, 200)                          // shake off blow C
-		    , mShakeOffSticking3(this, 'ip06', "振り払い張付３", 10, 0, 100)                      // shake off sticking 3
-		    , mShakeOffBlowD(this, 'ip07', "振り払い打撃Ｄ", 30, 0, 200)                          // shake off blow D
+		    , mAttackRadius(this, 'fp22', "攻撃ヒット範囲", 70.0f, 0.0f, 1000.0f)  // attack hit range
+		    , mAttackHitAngle(this, 'fp23', "攻撃ヒット角度", 15.0f, 0.0f, 180.0f) // attack hit angle
+		    , mAttackDamage(this, 'fp24', "攻撃力", 10.0f, 0.0f, 1000.0f)          // attack power
+		    , mAlertDuration(this, 'fp29', "警戒時間", 15.0f, 0.0f, 99.0f)         // alert time
+		    , mBitterDuration(this, 'fp35', "石化時間", 1.0f, 0.0f, 60.0f)         // stone time
+		    , mPurplePikiStunDamage(this, 'fp36', "ヒップドロップダメージ", 10.0f, 0.0f, 1000.0f) // hip drop damage
+		    , mPurplePikiStunChance(this, 'fp37', "地震気絶確立", 0.05f, 0.0f, 1.0f)              // earthquake faint probability
+		    , mPurplePikiStunDuration(this, 'fp38', "地震気絶時間", 10.0f, 0.0f, 60.0f)           // earthquake faint time
+		    , mShakeOffBlowA(this, 'ip01', "振り払い打撃Ａ", 3, 0, 200)                           // shake off blow A
+		    , mShakeOffSticking1(this, 'ip02', "振り払い張付１", 3, 0, 100)                       // shake off sticking 1
+		    , mShakeOffBlowB(this, 'ip03', "振り払い打撃Ｂ", 8, 0, 200)                           // shake off blow B
+		    , mShakeOffSticking2(this, 'ip04', "振り払い張付２", 5, 0, 100)                       // shake off sticking 2
+		    , mShakeOffBlowC(this, 'ip05', "振り払い打撃Ｃ", 15, 0, 200)                          // shake off blow C
+		    , mShakeOffSticking3(this, 'ip06', "振り払い張付３", 10, 0, 100)                      // shake off sticking 3
+		    , mShakeOffBlowD(this, 'ip07', "振り払い打撃Ｄ", 30, 0, 200)                          // shake off blow D
 		{
 		}

--- a/include/Game/Entities/Armor.h
+++ b/include/Game/Entities/Armor.h
@ -110,9 +110,9 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mPoisonDamage(this, 'fp01', "白ピクミン", 300.0f, 0.0f, 10000.0f)   // 'white pikmin'
-		    , mAttackLoopTimer(this, 'fp11', "攻撃ループ時間", 0.0f, 0.0f, 10.0f) // 'attack loop time'
-		    , mBridgeDamage(this, 'fp12', "橋食いパワー", 100.0f, 0.0f, 100.0f)   // 'bridge eating power'
+		    , mPoisonDamage(this, 'fp01', "白ピクミン", 300.0f, 0.0f, 10000.0f)   // 'white pikmin'
+		    , mAttackLoopTimer(this, 'fp11', "攻撃ループ時間", 0.0f, 0.0f, 10.0f) // 'attack loop time'
+		    , mBridgeDamage(this, 'fp12', "橋食いパワー", 100.0f, 0.0f, 100.0f)   // 'bridge eating power'
 		{
 		}

--- a/include/Game/Entities/Baby.h
+++ b/include/Game/Entities/Baby.h
@ -91,8 +91,8 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mPoisonDamage(this, 'fp01', "白ピクミン", 300.0f, 0.0f, 10000.0f) // 'white pikmin'
-		    , mNectarChance(this, 'fp11', "蜜出し確率", 0.2f, 0.0f, 1.0f)       // 'probability of getting out honey'
+		    , mPoisonDamage(this, 'fp01', "白ピクミン", 300.0f, 0.0f, 10000.0f) // 'white pikmin'
+		    , mNectarChance(this, 'fp11', "蜜出し確率", 0.2f, 0.0f, 1.0f)       // 'probability of getting out honey'
 		{
 		}

--- a/include/Game/Entities/BigFoot.h
+++ b/include/Game/Entities/BigFoot.h
@ -184,25 +184,25 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mBaseCoefficient(this, 'fp01', "ベース係数", 3.0f, 0.0f, 10.0f)        // 'base factor'
-		    , mRaiseSlowdownFactor(this, 'fp02', "上げ減速係数", -0.2f, -5.0f, 5.0f) // 'raising deceleration factor'
-		    , mDownwardAccelFactor(this, 'fp03', "下げ加速係数", 0.5f, -5.0f, 5.0f)  // 'downward acceleration factor'
-		    , mMinDecelFactor(this, 'fp04', "最低減加速係数", -2.5f, -10.0f,
+		    , mBaseCoefficient(this, 'fp01', "ベース係数", 3.0f, 0.0f, 10.0f)        // 'base factor'
+		    , mRaiseSlowdownFactor(this, 'fp02', "上げ減速係数", -0.2f, -5.0f, 5.0f) // 'raising deceleration factor'
+		    , mDownwardAccelFactor(this, 'fp03', "下げ加速係数", 0.5f, -5.0f, 5.0f)  // 'downward acceleration factor'
+		    , mMinDecelFactor(this, 'fp04', "最低減加速係数", -2.5f, -10.0f,
 		                      10.0f) // 'minimum deceleration acceleration factor'
-		    , mMaxDecelFactor(this, 'fp05', "最高減加速係数", 10.0f, -10.0f,
+		    , mMaxDecelFactor(this, 'fp05', "最高減加速係数", 10.0f, -10.0f,
 		                      10.0f)                                                           // 'maximum deceleration acceleration factor'
-		    , mLegSwing(this, 'fp06', "足の振り上げ", 120.0f, 0.0f, 200.0f)                    // 'leg swing'
-		    , mEnragedBaseCoefficient(this, 'fp11', "ベース係数(s)", 3.0f, 0.0f, 10.0f)        // 'base factor(s)'
-		    , mEnragedRaiseSlowdownFactor(this, 'fp12', "上げ減速係数(s)", -0.2f, -5.0f, 5.0f) // 'raising deceleration factor(s)'
-		    , mEnragedDownwardAccelFactor(this, 'fp13', "下げ加速係数(s)", 0.5f, -5.0f, 5.0f)  // 'downward acceleration factor(s)'
-		    , mEnragedMinDecelFactor(this, 'fp14', "最低減加速係数(s)", -2.0f, -10.0f,
+		    , mLegSwing(this, 'fp06', "足の振り上げ", 120.0f, 0.0f, 200.0f)                    // 'leg swing'
+		    , mEnragedBaseCoefficient(this, 'fp11', "ベース係数(s)", 3.0f, 0.0f, 10.0f)        // 'base factor(s)'
+		    , mEnragedRaiseSlowdownFactor(this, 'fp12', "上げ減速係数(s)", -0.2f, -5.0f, 5.0f) // 'raising deceleration factor(s)'
+		    , mEnragedDownwardAccelFactor(this, 'fp13', "下げ加速係数(s)", 0.5f, -5.0f, 5.0f)  // 'downward acceleration factor(s)'
+		    , mEnragedMinDecelFactor(this, 'fp14', "最低減加速係数(s)", -2.0f, -10.0f,
 		                             10.0f) // 'minimum deceleration acceleration factor(s)'
-		    , mEnragedMaxDecelFactor(this, 'fp15', "最高減加速係数(s)", 10.0f, -10.0f,
+		    , mEnragedMaxDecelFactor(this, 'fp15', "最高減加速係数(s)", 10.0f, -10.0f,
 		                             10.0f)                                            // 'maximum deceleration acceleration factor(s)'
-		    , mEnragedLegSwing(this, 'fp16', "足の振り上げ(s)", 120.0f, 0.0f, 200.0f)  // 'leg swing(s)'
-		    , mMovementOffset(this, 'fp17', "移動オフセット(s)", 50.0f, 0.0f, 200.0f)  // 'movement offset(s)'
-		    , mNormalTravelTime(this, 'fp20', "通常移動時間", 10.0f, 0.0f, 100.0f)     // 'normal travel time'
-		    , mPostShakeTravelTime(this, 'fp21', "振払後移動時間", 3.0f, 0.0f, 100.0f) // 'post-shakeoff travel time'
+		    , mEnragedLegSwing(this, 'fp16', "足の振り上げ(s)", 120.0f, 0.0f, 200.0f)  // 'leg swing(s)'
+		    , mMovementOffset(this, 'fp17', "移動オフセット(s)", 50.0f, 0.0f, 200.0f)  // 'movement offset(s)'
+		    , mNormalTravelTime(this, 'fp20', "通常移動時間", 10.0f, 0.0f, 100.0f)     // 'normal travel time'
+		    , mPostShakeTravelTime(this, 'fp21', "振払後移動時間", 3.0f, 0.0f, 100.0f) // 'post-shakeoff travel time'
 		{
 		}

--- a/include/Game/Entities/BigTreasure.h
+++ b/include/Game/Entities/BigTreasure.h
@ -306,80 +306,80 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mBaseFactor(this, 'fp01', "ベース係数", 3.0f, 0.0f, 10.0f)                   // 'base factor'
-		    , mRaiseDecelFactor(this, 'fp02', "上げ減速係数", -0.2f, -5.0f, 5.0f)          // 'raising deceleration factor'
-		    , mDownwardDecelFactor(this, 'fp03', "下げ加速係数", 0.5f, -5.0f, 5.0f)        // 'downward acceleration factor'
-		    , mMinReducedAccelFactor(this, 'fp04', "最低減加速係数", -2.0f, -10.0f, 10.0f) // 'min reduced acceleration factor'
-		    , mMaxDecelAccelFactor(this, 'fp05', "最高減加速係数", 10.0f, -10.0f, 10.0f)   // 'max deceleration acceleration factor'
-		    , mLegSwing(this, 'fp06', "足の振り上げ", 120.0f, 0.0f, 200.0f)                // 'leg swing'
-		    , mElectricityWaitTime(this, 'fp10', "予\備時間(電気)", 2.5f, 0.0f, 10.0f)     // 'wait time (electricity)'
-		    , mFireWaitTime1(this, 'fp11', "予\備時間(火:1)", 2.8f, 0.0f, 10.0f)           // 'wait time (fire:1)'
-		    , mFireWaitTime2(this, 'fp31', "予\備時間(火:2)", 2.5f, 0.0f, 10.0f)           // 'wait time (fire:2)'
-		    , mGasWaitTime(this, 'fp12', "予\備時間(ガス)", 2.5f, 0.0f, 10.0f)             // 'wait time (gas)'
-		    , mWaterWaitTime(this, 'fp13', "予\備時間(水)", 2.5f, 0.0f, 10.0f)             // 'wait time (water)'
-		    , mElecAttackTimeMax(this, 'fp20', "攻撃時間(電気)", 5.0f, 0.0f, 10.0f)        // 'attack time (electricity)'
-		    , mFireAttackTimeMax(this, 'fp21', "攻撃時間(火)", 5.0f, 0.0f, 10.0f)          // 'attack time (fire)'
-		    , mGasAttackTimeMax(this, 'fp22', "攻撃時間(ガス)", 5.0f, 0.0f, 10.0f)         // 'attack time (gas)'
-		    , mWaterAttackTimeMax(this, 'fp23', "攻撃時間(水)", 5.0f, 0.0f, 10.0f)         // 'attack time (water)'
+		    , mBaseFactor(this, 'fp01', "ベース係数", 3.0f, 0.0f, 10.0f)                   // 'base factor'
+		    , mRaiseDecelFactor(this, 'fp02', "上げ減速係数", -0.2f, -5.0f, 5.0f)          // 'raising deceleration factor'
+		    , mDownwardDecelFactor(this, 'fp03', "下げ加速係数", 0.5f, -5.0f, 5.0f)        // 'downward acceleration factor'
+		    , mMinReducedAccelFactor(this, 'fp04', "最低減加速係数", -2.0f, -10.0f, 10.0f) // 'min reduced acceleration factor'
+		    , mMaxDecelAccelFactor(this, 'fp05', "最高減加速係数", 10.0f, -10.0f, 10.0f)   // 'max deceleration acceleration factor'
+		    , mLegSwing(this, 'fp06', "足の振り上げ", 120.0f, 0.0f, 200.0f)                // 'leg swing'
+		    , mElectricityWaitTime(this, 'fp10', "予\備時間(電気)", 2.5f, 0.0f, 10.0f)     // 'wait time (electricity)'
+		    , mFireWaitTime1(this, 'fp11', "予\備時間(火:1)", 2.8f, 0.0f, 10.0f)           // 'wait time (fire:1)'
+		    , mFireWaitTime2(this, 'fp31', "予\備時間(火:2)", 2.5f, 0.0f, 10.0f)           // 'wait time (fire:2)'
+		    , mGasWaitTime(this, 'fp12', "予\備時間(ガス)", 2.5f, 0.0f, 10.0f)             // 'wait time (gas)'
+		    , mWaterWaitTime(this, 'fp13', "予\備時間(水)", 2.5f, 0.0f, 10.0f)             // 'wait time (water)'
+		    , mElecAttackTimeMax(this, 'fp20', "攻撃時間(電気)", 5.0f, 0.0f, 10.0f)        // 'attack time (electricity)'
+		    , mFireAttackTimeMax(this, 'fp21', "攻撃時間(火)", 5.0f, 0.0f, 10.0f)          // 'attack time (fire)'
+		    , mGasAttackTimeMax(this, 'fp22', "攻撃時間(ガス)", 5.0f, 0.0f, 10.0f)         // 'attack time (gas)'
+		    , mWaterAttackTimeMax(this, 'fp23', "攻撃時間(水)", 5.0f, 0.0f, 10.0f)         // 'attack time (water)'

-		    , mBounceCoefficient1_1(this, 'fe00', "跳返係数(1-1)", 0.75f, 0.0f, 1.0f)         // 'bounce coefficient (1-1)'
-		    , mFrictionCoefficient1_1(this, 'fe01', "摩擦係数(1-1)", 0.65f, 0.0f, 1.0f)       // 'friction coefficient (1-1)'
-		    , mBaseMuzzleVelocityXZ1_1(this, 'fe02', "XZ初速Base(1-1)", 100.0f, 0.0f, 500.0f) // 'XZ initial velocity Base (1-1)'
-		    , mRandMuzzleVelocityXZ1_1(this, 'fe03', "XZ初速Rand(1-1)", 220.0f, 0.0f, 500.0f) // 'XZ initial velocity Rand (1-1)'
-		    , mBaseMuzzleVelocityY1_1(this, 'fe04', "Y初速Base(1-1)", 170.0f, 0.0f, 500.0f)   // 'Y initial velocity Base (1-1)'
-		    , mRandMuzzleVelocityY1_1(this, 'fe05', "Y初速Rand(1-1)", 200.0f, 0.0f, 500.0f)   // 'Y initial velocity Rand (1-1)'
-		    , mDischargeStart1_1(this, 'fe06', "放電開始(1-1)", 2.7f, 0.0f, 5.0f)             // 'discharge start (1-1)'
-		    , mChainInterval1_1(this, 'fe08', "連鎖間隔(1-1)", 0.02f, 0.0f, 1.0f)             // 'chain interval (1-1)'
-		    , mDischargeCount1_1(this, 'fe07', "放電数(1-1)", 10, 0, 16)                      // 'number of discharges (1-1)'
+		    , mBounceCoefficient1_1(this, 'fe00', "跳返係数(1-1)", 0.75f, 0.0f, 1.0f)         // 'bounce coefficient (1-1)'
+		    , mFrictionCoefficient1_1(this, 'fe01', "摩擦係数(1-1)", 0.65f, 0.0f, 1.0f)       // 'friction coefficient (1-1)'
+		    , mBaseMuzzleVelocityXZ1_1(this, 'fe02', "XZ初速Base(1-1)", 100.0f, 0.0f, 500.0f) // 'XZ initial velocity Base (1-1)'
+		    , mRandMuzzleVelocityXZ1_1(this, 'fe03', "XZ初速Rand(1-1)", 220.0f, 0.0f, 500.0f) // 'XZ initial velocity Rand (1-1)'
+		    , mBaseMuzzleVelocityY1_1(this, 'fe04', "Y初速Base(1-1)", 170.0f, 0.0f, 500.0f)   // 'Y initial velocity Base (1-1)'
+		    , mRandMuzzleVelocityY1_1(this, 'fe05', "Y初速Rand(1-1)", 200.0f, 0.0f, 500.0f)   // 'Y initial velocity Rand (1-1)'
+		    , mDischargeStart1_1(this, 'fe06', "放電開始(1-1)", 2.7f, 0.0f, 5.0f)             // 'discharge start (1-1)'
+		    , mChainInterval1_1(this, 'fe08', "連鎖間隔(1-1)", 0.02f, 0.0f, 1.0f)             // 'chain interval (1-1)'
+		    , mDischargeCount1_1(this, 'fe07', "放電数(1-1)", 10, 0, 16)                      // 'number of discharges (1-1)'

-		    , mBounceCoefficient1_2(this, 'fe10', "跳返係数(1-2)", 0.7f, 0.0f, 1.0f)          // 'bounce coefficient (1-2)'
-		    , mFrictionCoefficient1_2(this, 'fe11', "摩擦係数(1-2)", 0.65f, 0.0f, 1.0f)       // 'friction coefficient (1-2)'
-		    , mBaseMuzzleVelocityXZ1_2(this, 'fe12', "XZ初速Base(1-2)", 80.0f, 0.0f, 500.0f)  // 'XZ initial velocity Base (1-2)'
-		    , mRandMuzzleVelocityXZ1_2(this, 'fe13', "XZ初速Rand(1-2)", 250.0f, 0.0f, 500.0f) // 'XZ initial velocity Rand (1-2)'
-		    , mBaseMuzzleVelocityY1_2(this, 'fe14', "Y初速Base(1-2)", 350.0f, 0.0f, 500.0f)   // 'Y initial velocity Base (1-2)'
-		    , mRandMuzzleVelocityY1_2(this, 'fe15', "Y初速Rand(1-2)", 100.0f, 0.0f, 500.0f)   // 'Y initial velocity Rand (1-2)'
-		    , mDischargeStart1_2(this, 'fe16', "放電開始(1-2)", 4.5f, 0.0f, 5.0f)             // 'discharge start (1-2)'
-		    , mChainInterval1_2(this, 'fe18', "連鎖間隔(1-2)", 0.02f, 0.0f, 1.0f)             // 'chain interval (1-2)'
-		    , mDischargeCount1_2(this, 'fe17', "放電数(1-2)", 12, 0, 16)                      // 'number of discharges (1-2)'
+		    , mBounceCoefficient1_2(this, 'fe10', "跳返係数(1-2)", 0.7f, 0.0f, 1.0f)          // 'bounce coefficient (1-2)'
+		    , mFrictionCoefficient1_2(this, 'fe11', "摩擦係数(1-2)", 0.65f, 0.0f, 1.0f)       // 'friction coefficient (1-2)'
+		    , mBaseMuzzleVelocityXZ1_2(this, 'fe12', "XZ初速Base(1-2)", 80.0f, 0.0f, 500.0f)  // 'XZ initial velocity Base (1-2)'
+		    , mRandMuzzleVelocityXZ1_2(this, 'fe13', "XZ初速Rand(1-2)", 250.0f, 0.0f, 500.0f) // 'XZ initial velocity Rand (1-2)'
+		    , mBaseMuzzleVelocityY1_2(this, 'fe14', "Y初速Base(1-2)", 350.0f, 0.0f, 500.0f)   // 'Y initial velocity Base (1-2)'
+		    , mRandMuzzleVelocityY1_2(this, 'fe15', "Y初速Rand(1-2)", 100.0f, 0.0f, 500.0f)   // 'Y initial velocity Rand (1-2)'
+		    , mDischargeStart1_2(this, 'fe16', "放電開始(1-2)", 4.5f, 0.0f, 5.0f)             // 'discharge start (1-2)'
+		    , mChainInterval1_2(this, 'fe18', "連鎖間隔(1-2)", 0.02f, 0.0f, 1.0f)             // 'chain interval (1-2)'
+		    , mDischargeCount1_2(this, 'fe17', "放電数(1-2)", 12, 0, 16)                      // 'number of discharges (1-2)'

-		    , mBounceCoefficient2_1(this, 'fe20', "跳返係数(2-1)", 0.97f, 0.0f, 1.0f)        // 'bounce coefficient (2-1)'
-		    , mFrictionCoefficient2_1(this, 'fe21', "摩擦係数(2-1)", 0.75f, 0.0f, 1.0f)      // 'friction coefficient (2-1)'
-		    , mBaseMuzzleVelocityXZ2_1(this, 'fe22', "XZ初速Base(2-1)", 60.0f, 0.0f, 500.0f) // 'XZ initial velocity Base (2-1)'
-		    , mRandMuzzleVelocityXZ2_1(this, 'fe23', "XZ初速Rand(2-1)", 70.0f, 0.0f, 500.0f) // 'XZ initial velocity Rand (2-1)'
-		    , mBaseMuzzleVelocityY2_1(this, 'fe24', "Y初速Base(2-1)", 350.0f, 0.0f, 500.0f)  // 'Y initial velocity Base (2-1)'
-		    , mRandMuzzleVelocityY2_1(this, 'fe25', "Y初速Rand(2-1)", 100.0f, 0.0f, 500.0f)  // 'Y initial velocity Rand (2-1)'
-		    , mDischargeStart2_1(this, 'fe26', "放電開始(2-1)", 0.5f, 0.0f, 5.0f)            // 'discharge start (2-1)'
-		    , mChainInterval2_1(this, 'fe28', "連鎖間隔(2-1)", 0.25f, 0.0f, 1.0f)            // 'chain interval (2-1)'
-		    , mDischargeCount2_1(this, 'fe27', "放電数(2-1)", 8, 0, 16)                      // 'number of discharges (2-1)'
+		    , mBounceCoefficient2_1(this, 'fe20', "跳返係数(2-1)", 0.97f, 0.0f, 1.0f)        // 'bounce coefficient (2-1)'
+		    , mFrictionCoefficient2_1(this, 'fe21', "摩擦係数(2-1)", 0.75f, 0.0f, 1.0f)      // 'friction coefficient (2-1)'
+		    , mBaseMuzzleVelocityXZ2_1(this, 'fe22', "XZ初速Base(2-1)", 60.0f, 0.0f, 500.0f) // 'XZ initial velocity Base (2-1)'
+		    , mRandMuzzleVelocityXZ2_1(this, 'fe23', "XZ初速Rand(2-1)", 70.0f, 0.0f, 500.0f) // 'XZ initial velocity Rand (2-1)'
+		    , mBaseMuzzleVelocityY2_1(this, 'fe24', "Y初速Base(2-1)", 350.0f, 0.0f, 500.0f)  // 'Y initial velocity Base (2-1)'
+		    , mRandMuzzleVelocityY2_1(this, 'fe25', "Y初速Rand(2-1)", 100.0f, 0.0f, 500.0f)  // 'Y initial velocity Rand (2-1)'
+		    , mDischargeStart2_1(this, 'fe26', "放電開始(2-1)", 0.5f, 0.0f, 5.0f)            // 'discharge start (2-1)'
+		    , mChainInterval2_1(this, 'fe28', "連鎖間隔(2-1)", 0.25f, 0.0f, 1.0f)            // 'chain interval (2-1)'
+		    , mDischargeCount2_1(this, 'fe27', "放電数(2-1)", 8, 0, 16)                      // 'number of discharges (2-1)'

-		    , mBounceCoefficient2_2(this, 'fe30', "跳返係数(2-2)", 0.2f, 0.0f, 1.0f)          // 'bounce coefficient (2-2)'
-		    , mFrictionCoefficient2_2(this, 'fe31', "摩擦係数(2-2)", 0.985f, 0.0f, 1.0f)      // 'friction coefficient (2-2)'
-		    , mBaseMuzzleVelocityXZ2_2(this, 'fe32', "XZ初速Base(2-2)", 100.0f, 0.0f, 500.0f) // 'XZ initial velocity Base (2-2)'
-		    , mRandMuzzleVelocityXZ2_2(this, 'fe33', "XZ初速Rand(2-2)", 90.0f, 0.0f, 500.0f)  // 'XZ initial velocity Rand (2-2)'
-		    , mBaseMuzzleVelocityY2_2(this, 'fe34', "Y初速Base(2-2)", 70.0f, 0.0f, 500.0f)    // 'Y initial velocity Base (2-2)'
-		    , mRandMuzzleVelocityY2_2(this, 'fe35', "Y初速Rand(2-2)", 20.0f, 0.0f, 500.0f)    // 'Y initial velocity Rand (2-2)'
-		    , mDischargeStart2_2(this, 'fe36', "放電開始(2-2)", 0.2f, 0.0f, 5.0f)             // 'discharge start (2-2)'
-		    , mChainInterval2_2(this, 'fe38', "連鎖間隔(2-2)", 0.15f, 0.0f, 1.0f)             // 'chain interval (2-2)'
-		    , mDischargeCount2_2(this, 'fe37', "放電数(2-2)", 14, 0, 16)                      // 'number of discharges (2-2)'
+		    , mBounceCoefficient2_2(this, 'fe30', "跳返係数(2-2)", 0.2f, 0.0f, 1.0f)          // 'bounce coefficient (2-2)'
+		    , mFrictionCoefficient2_2(this, 'fe31', "摩擦係数(2-2)", 0.985f, 0.0f, 1.0f)      // 'friction coefficient (2-2)'
+		    , mBaseMuzzleVelocityXZ2_2(this, 'fe32', "XZ初速Base(2-2)", 100.0f, 0.0f, 500.0f) // 'XZ initial velocity Base (2-2)'
+		    , mRandMuzzleVelocityXZ2_2(this, 'fe33', "XZ初速Rand(2-2)", 90.0f, 0.0f, 500.0f)  // 'XZ initial velocity Rand (2-2)'
+		    , mBaseMuzzleVelocityY2_2(this, 'fe34', "Y初速Base(2-2)", 70.0f, 0.0f, 500.0f)    // 'Y initial velocity Base (2-2)'
+		    , mRandMuzzleVelocityY2_2(this, 'fe35', "Y初速Rand(2-2)", 20.0f, 0.0f, 500.0f)    // 'Y initial velocity Rand (2-2)'
+		    , mDischargeStart2_2(this, 'fe36', "放電開始(2-2)", 0.2f, 0.0f, 5.0f)             // 'discharge start (2-2)'
+		    , mChainInterval2_2(this, 'fe38', "連鎖間隔(2-2)", 0.15f, 0.0f, 1.0f)             // 'chain interval (2-2)'
+		    , mDischargeCount2_2(this, 'fe37', "放電数(2-2)", 14, 0, 16)                      // 'number of discharges (2-2)'

-		    , mPatternCheckFlame(this, 'fe99', "パターンチェック", 0, 0, 4)    // 'pattern check'
-		    , mFlameScale1(this, 'ff00', "火炎スケール(1)", 1.0f, 0.5f, 5.0f)  // 'flame scale (1)'
-		    , mFlameScale2(this, 'ff10', "火炎スケール(2)", 1.25f, 0.5f, 5.0f) // 'flame scale (2)'
+		    , mPatternCheckFlame(this, 'fe99', "パターンチェック", 0, 0, 4)    // 'pattern check'
+		    , mFlameScale1(this, 'ff00', "火炎スケール(1)", 1.0f, 0.5f, 5.0f)  // 'flame scale (1)'
+		    , mFlameScale2(this, 'ff10', "火炎スケール(2)", 1.25f, 0.5f, 5.0f) // 'flame scale (2)'

-		    , mPatternCheckRotation(this, 'fg99', "パターンチェック", 0, 0, 2)       // 'pattern check'
-		    , mRotationSpeed1(this, 'fg00', "回転スピード(1)", 0.015f, 0.01f, 0.03f) // 'rotation speed (1)'
-		    , mRotationSpeed2(this, 'fg10', "回転スピード(2)", 0.02f, 0.01f, 0.03f)  // 'rotation speed (2)'
-		    , mReversalTime2_1(this, 'fg30', "反転時間(2-1)", 30.0f, 0.0f, 30.0f)    // 'reversal time (2-1)'
-		    , mReversalTime2_2(this, 'fg40', "反転時間(2-2)", 2.0f, 0.0f, 30.0f)     // 'reversal time (2-2)'
+		    , mPatternCheckRotation(this, 'fg99', "パターンチェック", 0, 0, 2)       // 'pattern check'
+		    , mRotationSpeed1(this, 'fg00', "回転スピード(1)", 0.015f, 0.01f, 0.03f) // 'rotation speed (1)'
+		    , mRotationSpeed2(this, 'fg10', "回転スピード(2)", 0.02f, 0.01f, 0.03f)  // 'rotation speed (2)'
+		    , mReversalTime2_1(this, 'fg30', "反転時間(2-1)", 30.0f, 0.0f, 30.0f)    // 'reversal time (2-1)'
+		    , mReversalTime2_2(this, 'fg40', "反転時間(2-2)", 2.0f, 0.0f, 30.0f)     // 'reversal time (2-2)'

-		    , mPatternCheckWater(this, 'fg99', "パターンチェック", 0, 0, 3)            // 'pattern check'
-		    , mWaterDischargeInterval1(this, 'fw00', "放水間隔(1)", 0.5f, 0.1f, 1.0f)  // 'water discharge interval (1)'
-		    , mRandomAngle1(this, 'fw01', "ランダム角度(1)", 0.5f, 0.0f, 1.0f)         // 'random angle (1)'
-		    , mRandomDistance1(this, 'fw02', "ランダム距離(1)", 100.0f, 0.0f, 500.0f)  // 'random distance (1)'
-		    , mWaterDischargeInterval2(this, 'fw10', "放水間隔(2)", 0.25f, 0.1f, 1.0f) // 'water discharge interval (2)
-		    , mRandomAngle2(this, 'fw11', "ランダム角度(2)", 0.4f, 0.0f, 1.0f)         // 'random angle (2)'
-		    , mRandomDistance2(this, 'fw12', "ランダム距離(2)", 50.0f, 0.0f, 500.0f)   // 'random distance (2)'
-		    , mPatternCheck4(this, 'fw99', "パターンチェック", 0, 0, 2)                // 'pattern check'
+		    , mPatternCheckWater(this, 'fg99', "パターンチェック", 0, 0, 3)            // 'pattern check'
+		    , mWaterDischargeInterval1(this, 'fw00', "放水間隔(1)", 0.5f, 0.1f, 1.0f)  // 'water discharge interval (1)'
+		    , mRandomAngle1(this, 'fw01', "ランダム角度(1)", 0.5f, 0.0f, 1.0f)         // 'random angle (1)'
+		    , mRandomDistance1(this, 'fw02', "ランダム距離(1)", 100.0f, 0.0f, 500.0f)  // 'random distance (1)'
+		    , mWaterDischargeInterval2(this, 'fw10', "放水間隔(2)", 0.25f, 0.1f, 1.0f) // 'water discharge interval (2)
+		    , mRandomAngle2(this, 'fw11', "ランダム角度(2)", 0.4f, 0.0f, 1.0f)         // 'random angle (2)'
+		    , mRandomDistance2(this, 'fw12', "ランダム距離(2)", 50.0f, 0.0f, 500.0f)   // 'random distance (2)'
+		    , mPatternCheck4(this, 'fw99', "パターンチェック", 0, 0, 2)                // 'pattern check'
 		{
 		}

--- a/include/Game/Entities/BlackMan.h
+++ b/include/Game/Entities/BlackMan.h
@ -245,22 +245,22 @@ struct Parms : public EnemyParmsBase {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
 		    // Pod?
-		    , mPodMoveSpeed(this, 'fp01', "ポッド移動速度", 10.0f, 0.0f, 100.0f)
+		    , mPodMoveSpeed(this, 'fp01', "ポッド移動速度", 10.0f, 0.0f, 100.0f)
 		    // Running away (escape)
-		    , mEscapeSpeed(this, 'fp02', "逃げ速度", 10.0f, 0.0f, 1000.0f)
-		    , mEscapeRotationSpeed(this, 'fp03', "逃げ回転速度率", 0.1f, 0.0f, 1.0f)
-		    , mMaxEscapeRotationStep(this, 'fp04', "逃げ回転最大速度", 10.0f, 0.0f, 360.0f)
+		    , mEscapeSpeed(this, 'fp02', "逃げ速度", 10.0f, 0.0f, 1000.0f)
+		    , mEscapeRotationSpeed(this, 'fp03', "逃げ回転速度率", 0.1f, 0.0f, 1.0f)
+		    , mMaxEscapeRotationStep(this, 'fp04', "逃げ回転最大速度", 10.0f, 0.0f, 360.0f)
 		    // Normal movement
-		    , mTravelSpeed(this, 'fp05', "2段階速度", 200.0f, 10.0f, 500.0f)
-		    , mRotationSpeed(this, 'fp06', "2段階回転速度率", 0.1f, 0.0f, 1.0f)
-		    , mMaxRotationStep(this, 'fp07', "2段階回転最大速度", 10.0f, 0.0f, 360.0f)
+		    , mTravelSpeed(this, 'fp05', "2段階速度", 200.0f, 10.0f, 500.0f)
+		    , mRotationSpeed(this, 'fp06', "2段階回転速度率", 0.1f, 0.0f, 1.0f)
+		    , mMaxRotationStep(this, 'fp07', "2段階回転最大速度", 10.0f, 0.0f, 360.0f)
 		    // Walking speed
-		    , mWalkingSpeed(this, 'fp11', "歩き速度", 10.0f, 0.0f, 100.0f)
-		    , mTimerToTwoStep(this, 'ip01', "2段階へのタイマー", 300, 0, 3000)
-		    , mDosinStopTimerLength(this, 'ip03', "ドシン停止タイマー", 200, 0, 600)
-		    , mFreezeTimerLength(this, 'ip04', "逃げ停止タイマー", 200, 0, 600)
-		    , mContinuousEscapeTimerLength(this, 'ip05', "連続逃げタイマー", 200, 0, 600)
-		    , mStandStillTimerLength(this, 'ip06', "つかれ停止タイマー", 200, 0, 600)
+		    , mWalkingSpeed(this, 'fp11', "歩き速度", 10.0f, 0.0f, 100.0f)
+		    , mTimerToTwoStep(this, 'ip01', "2段階へのタイマー", 300, 0, 3000)
+		    , mDosinStopTimerLength(this, 'ip03', "ドシン停止タイマー", 200, 0, 600)
+		    , mFreezeTimerLength(this, 'ip04', "逃げ停止タイマー", 200, 0, 600)
+		    , mContinuousEscapeTimerLength(this, 'ip05', "連続逃げタイマー", 200, 0, 600)
+		    , mStandStillTimerLength(this, 'ip06', "つかれ停止タイマー", 200, 0, 600)
 		{
 		}

--- a/include/Game/Entities/Bomb.h
+++ b/include/Game/Entities/Bomb.h
@ -135,10 +135,10 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mDamageToEnemies(this, 'fp01', "敵へのダメージ", 250.0f, 0.0f, 2000.0f) // 'damage to enemies'
-		    , mBlastRangeHeight(this, 'fp02', "爆風範囲高さ+-", 50.0f, 0.0f, 50.0f)   // 'blast range height +-'
-		    , mDamageLimit(this, 'ip01', "ダメージリミット", 2, 1, 10)                // 'damage limit'
-		    , mTriggerLimit(this, 'ip02', "誘爆リミット", 50, 0, 100)                 // 'induction limit'
+		    , mDamageToEnemies(this, 'fp01', "敵へのダメージ", 250.0f, 0.0f, 2000.0f) // 'damage to enemies'
+		    , mBlastRangeHeight(this, 'fp02', "爆風範囲高さ+-", 50.0f, 0.0f, 50.0f)   // 'blast range height +-'
+		    , mDamageLimit(this, 'ip01', "ダメージリミット", 2, 1, 10)                // 'damage limit'
+		    , mTriggerLimit(this, 'ip02', "誘爆リミット", 50, 0, 100)                 // 'induction limit'
 		{
 		}

--- a/include/Game/Entities/BombSarai.h
+++ b/include/Game/Entities/BombSarai.h
@ -122,15 +122,15 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mFlightHeight(this, 'fp01', "飛行高さ", 90.0f, 0.0f, 150.0f)      // 'flight height'
-		    , mTransitHeight(this, 'fp03', "状態遷移高さ", 50.0f, 0.0f, 300.0f) // 'state transition height'
-		    , mPitchRate(this, 'fp10', "上下の揺れ速度", 2.5f, 0.0f, 10.0f)     // 'vertical swing speed'
-		    , mPitchAmp(this, 'fp11', "上下の揺れ幅", 20.0f, 0.0f, 50.0f)       // 'width of vertical swing'
-		    , mFreeRiseFactor(this, 'fp21', "上昇係数(0)", 1.5f, 0.0f, 5.0f)    // 'climbing factor (0)'
-		    , mLadenRiseFactor(this, 'fp22', "上昇係数(5)", 1.0f, 0.0f, 5.0f)   // 'climbing factor (5)'
-		    , mFreeFlickChance(this, 'fp31', "振払確率(1)", 0.1f, 0.0f, 1.0f)   // 'payoff probability (1)'
-		    , mLadenFlickChance(this, 'fp32', "振払確率(5)", 0.7f, 0.0f, 1.0f)  // 'payoff probability (5)'
-		    , mStruggleTime(this, 'fp40', "もがき時間", 3.0f, 0.0f, 10.0f)      // 'struggling time'
+		    , mFlightHeight(this, 'fp01', "飛行高さ", 90.0f, 0.0f, 150.0f)      // 'flight height'
+		    , mTransitHeight(this, 'fp03', "状態遷移高さ", 50.0f, 0.0f, 300.0f) // 'state transition height'
+		    , mPitchRate(this, 'fp10', "上下の揺れ速度", 2.5f, 0.0f, 10.0f)     // 'vertical swing speed'
+		    , mPitchAmp(this, 'fp11', "上下の揺れ幅", 20.0f, 0.0f, 50.0f)       // 'width of vertical swing'
+		    , mFreeRiseFactor(this, 'fp21', "上昇係数(0)", 1.5f, 0.0f, 5.0f)    // 'climbing factor (0)'
+		    , mLadenRiseFactor(this, 'fp22', "上昇係数(5)", 1.0f, 0.0f, 5.0f)   // 'climbing factor (5)'
+		    , mFreeFlickChance(this, 'fp31', "振払確率(1)", 0.1f, 0.0f, 1.0f)   // 'payoff probability (1)'
+		    , mLadenFlickChance(this, 'fp32', "振払確率(5)", 0.7f, 0.0f, 1.0f)  // 'payoff probability (5)'
+		    , mStruggleTime(this, 'fp40', "もがき時間", 3.0f, 0.0f, 10.0f)      // 'struggling time'
 		{
 		}

--- a/include/Game/Entities/ChappyBase.h
+++ b/include/Game/Entities/ChappyBase.h
@ -122,9 +122,9 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "ChappyParms")
-		    , mFootRange(this, 'fp01', "足元範囲", 50.0f, 0.0f, 100.0f)             // 'foot range'
-		    , mPoisonDamage(this, 'fp02', "白ピクミン毒", 300.0f, 0.0f, 1000.0f)    // 'white pikmin poison'
-		    , mBulborbWakeRadius(this, 'fp03', "目覚め距離", 400.0f, 0.0f, 1000.0f) // 'awake distance'
+		    , mFootRange(this, 'fp01', "足元範囲", 50.0f, 0.0f, 100.0f)             // 'foot range'
+		    , mPoisonDamage(this, 'fp02', "白ピクミン毒", 300.0f, 0.0f, 1000.0f)    // 'white pikmin poison'
+		    , mBulborbWakeRadius(this, 'fp03', "目覚め距離", 400.0f, 0.0f, 1000.0f) // 'awake distance'
 		{
 		}

--- a/include/Game/Entities/Damagumo.h
+++ b/include/Game/Entities/Damagumo.h
@ -176,12 +176,12 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mBaseFactor(this, 'fp01', "ベース係数", 3.0f, 0.0f, 10.0f)                 // 'base factor'
-		    , mRaiseDecelFactor(this, 'fp02', "上げ減速係数", -0.2f, -5.0f, 5.0f)        // 'raising deceleration factor'
-		    , mDownwardAccelFactor(this, 'fp03', "下げ加速係数", 0.5f, -5.0f, 5.0f)      // 'downward acceleration factor'
-		    , mMinDecelAccelFactor(this, 'fp04', "最低減加速係数", -2.0f, -10.0f, 10.0f) // 'minimum deceleration acceleration factor'
-		    , mMaxDecelAccelFactor(this, 'fp05', "最高減加速係数", 10.0f, -10.0f, 10.0f) // 'maximum deceleration acceleration factor'
-		    , mLegSwing(this, 'fp06', "足の振り上げ", 120.0f, 0.0f, 200.0f)              // 'leg swing'
+		    , mBaseFactor(this, 'fp01', "ベース係数", 3.0f, 0.0f, 10.0f)                 // 'base factor'
+		    , mRaiseDecelFactor(this, 'fp02', "上げ減速係数", -0.2f, -5.0f, 5.0f)        // 'raising deceleration factor'
+		    , mDownwardAccelFactor(this, 'fp03', "下げ加速係数", 0.5f, -5.0f, 5.0f)      // 'downward acceleration factor'
+		    , mMinDecelAccelFactor(this, 'fp04', "最低減加速係数", -2.0f, -10.0f, 10.0f) // 'minimum deceleration acceleration factor'
+		    , mMaxDecelAccelFactor(this, 'fp05', "最高減加速係数", 10.0f, -10.0f, 10.0f) // 'maximum deceleration acceleration factor'
+		    , mLegSwing(this, 'fp06', "足の振り上げ", 120.0f, 0.0f, 200.0f)              // 'leg swing'
 		{
 		}

--- a/include/Game/Entities/DangoMushi.h
+++ b/include/Game/Entities/DangoMushi.h
@ -43,10 +43,10 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mRollingMoveSpeed(this, 'fp01', "ローリング移動速度", 200.0f, 0.0f, 500.0f)    // 'rolling movement speed'
-		    , mRollingTurnAccel(this, 'fp02', "ローリング回転速度率", 0.1f, 0.0f, 1.0f)      // 'rolling rotation speed rate'
-		    , mRollingTurnSpeed(this, 'fp03', "ローリング回転最大速度", 10.0f, 0.0f, 360.0f) // 'rolling rotation maximum speed'
-		    , mFlipTime(this, 'fp10', "ひっくり返り時間", 7.5f, 0.0f, 30.0f)                 // 'flip time'
+		    , mRollingMoveSpeed(this, 'fp01', "ローリング移動速度", 200.0f, 0.0f, 500.0f)    // 'rolling movement speed'
+		    , mRollingTurnAccel(this, 'fp02', "ローリング回転速度率", 0.1f, 0.0f, 1.0f)      // 'rolling rotation speed rate'
+		    , mRollingTurnSpeed(this, 'fp03', "ローリング回転最大速度", 10.0f, 0.0f, 360.0f) // 'rolling rotation maximum speed'
+		    , mFlipTime(this, 'fp10', "ひっくり返り時間", 7.5f, 0.0f, 30.0f)                 // 'flip time'
 		{
 		}

--- a/include/Game/Entities/Egg.h
+++ b/include/Game/Entities/Egg.h
@ -104,11 +104,11 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mSingleNectarChance(this, 'fp01', "蜜レート", 1.0f, 0.0f, 1.0f)       // 'nectar rate'
-		    , mDoubleNectarChance(this, 'fp02', "蜜x2レート", 1.0f, 0.0f, 1.0f)     // 'nectar x2 rate'
-		    , mMititesChance(this, 'fp03', "タマゴムシx10レート", 1.0f, 0.0f, 1.0f) // 'mitite x10 rate'
-		    , mSpicyChance(this, 'fp04', "赤ドーピングレート", 1.0f, 0.0f, 1.0f)    // 'red doping rate'
-		    , mBitterChance(this, 'fp05', "黒ドーピングレート", 1.0f, 0.0f, 1.0f)   // 'black doping rate'
+		    , mSingleNectarChance(this, 'fp01', "蜜レート", 1.0f, 0.0f, 1.0f)       // 'nectar rate'
+		    , mDoubleNectarChance(this, 'fp02', "蜜x2レート", 1.0f, 0.0f, 1.0f)     // 'nectar x2 rate'
+		    , mMititesChance(this, 'fp03', "タマゴムシx10レート", 1.0f, 0.0f, 1.0f) // 'mitite x10 rate'
+		    , mSpicyChance(this, 'fp04', "赤ドーピングレート", 1.0f, 0.0f, 1.0f)    // 'red doping rate'
+		    , mBitterChance(this, 'fp05', "黒ドーピングレート", 1.0f, 0.0f, 1.0f)   // 'black doping rate'
 		{
 		}

--- a/include/Game/Entities/ElecBug.h
+++ b/include/Game/Entities/ElecBug.h
@ -93,9 +93,9 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mFlipTime(this, 'fp01', "ひっくり返り時間", 5.0f, 0.0f, 10.0f) // 'flip time'
-		    , mWaitTime(this, 'fp02', "ウェイト時間", 1.5f, 0.0f, 10.0f)     // 'wait time'
-		    , mDischargeTime(this, 'fp11', "放電時間", 3.0f, 0.0f, 10.0f)    // 'discharge time'
+		    , mFlipTime(this, 'fp01', "ひっくり返り時間", 5.0f, 0.0f, 10.0f) // 'flip time'
+		    , mWaitTime(this, 'fp02', "ウェイト時間", 1.5f, 0.0f, 10.0f)     // 'wait time'
+		    , mDischargeTime(this, 'fp11', "放電時間", 3.0f, 0.0f, 10.0f)    // 'discharge time'
 		{
 		}

--- a/include/Game/Entities/ElecHiba.h
+++ b/include/Game/Entities/ElecHiba.h
@ -126,10 +126,10 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mWaitTime(this, 'fp02', "ウェイト時間", 2.5f, 0.0f, 100.0f) // 'wait time'
-		    , mWarningTime(this, 'fp03', "予\兆時間", 2.5f, 0.0f, 100.0f) // 'warning time'
-		    , mActiveTime(this, 'fp01', "放電時間", 2.5f, 0.0f, 100.0f)   // 'discharge time'
-		    , mStopTime(this, 'fp04', "停止時間", 10.0f, 0.0f, 100.0f)    // 'stop time'
+		    , mWaitTime(this, 'fp02', "ウェイト時間", 2.5f, 0.0f, 100.0f) // 'wait time'
+		    , mWarningTime(this, 'fp03', "予\兆時間", 2.5f, 0.0f, 100.0f) // 'warning time'
+		    , mActiveTime(this, 'fp01', "放電時間", 2.5f, 0.0f, 100.0f)   // 'discharge time'
+		    , mStopTime(this, 'fp04', "停止時間", 10.0f, 0.0f, 100.0f)    // 'stop time'
 		    , mLodNear(this, 'fp90', "LOD NEAR", 0.085f, 0.0f, 1.0f)
 		    , mLodMiddle(this, 'fp91', "LOD MIDDLE", 0.05f, 0.0f, 1.0f)
 		{
--- a/include/Game/Entities/Frog.h
+++ b/include/Game/Entities/Frog.h
@ -117,10 +117,10 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "FrogParms")
-		    , mAirTime(this, 'fp01', "空中時間", 1.5f, 0.0f, 5.0f)            // 'air time'
-		    , mJumpSpeed(this, 'fp02', "ジャンプ速度", 400.0f, 0.0f, 1000.0f) // 'jump speed'
-		    , mJumpFailChance(this, 'fp03', "失敗確率", 0.2f, 0.0f, 1.0f)     // 'probability of failure'
-		    , mFallSpeed(this, 'fp04', "落下初速度", 300.0f, 0.0f, 500.0f)    // 'initial fall velocity'
+		    , mAirTime(this, 'fp01', "空中時間", 1.5f, 0.0f, 5.0f)            // 'air time'
+		    , mJumpSpeed(this, 'fp02', "ジャンプ速度", 400.0f, 0.0f, 1000.0f) // 'jump speed'
+		    , mJumpFailChance(this, 'fp03', "失敗確率", 0.2f, 0.0f, 1.0f)     // 'probability of failure'
+		    , mFallSpeed(this, 'fp04', "落下初速度", 300.0f, 0.0f, 500.0f)    // 'initial fall velocity'
 		{
 		}

--- a/include/Game/Entities/Fuefuki.h
+++ b/include/Game/Entities/Fuefuki.h
@ -121,15 +121,15 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mMaxGroundTime(this, 'fp01', "出現時間(Max)", 30.0f, 0.0f, 100.0f)                   // 'appearance time (max)'
-		    , mMinGroundTime(this, 'fp02', "出現時間(Min)", 20.0f, 0.0f, 100.0f)                   // 'appearance time (min)'
-		    , mAirborneTime(this, 'fp03', "出現間隔", 3.0f, 0.0f, 100.0f)                          // 'appearance interval'
-		    , mMinWhistleTime(this, 'fp11', "フエ間隔(1)", 0.0f, 0.0f, 5.0f)                       // 'hue interval (1)
-		    , mMaxWhistleTimeNoSquad(this, 'fp12', "フエ間隔(2～:隊列ナシ)", 5.0f, 0.0f, 10.0f)    // 'hue interval (2 ~: no formation)'
-		    , mMaxWhistleTimeWithSquad(this, 'fp13', "フエ間隔(2～:隊列アリ)", 10.0f, 0.0f, 20.0f) // 'hue interval (2 ~: platoon ants)'
-		    , mStruggleTime(this, 'fp21', "もがき時間", 3.0f, 0.0f, 10.0f)                         // 'struggling time'
-		    , mJumpTime(this, 'fp22', "逃げジャンプ時間", 0.0f, 0.0f, 5.0f)                        // 'escape jump time'
-		    , mNormalLandingChance(this, 'fp31', "通常出現率", 0.5f, 0.0f, 1.0f)                   // 'normal appearance rate'
+		    , mMaxGroundTime(this, 'fp01', "出現時間(Max)", 30.0f, 0.0f, 100.0f)                   // 'appearance time (max)'
+		    , mMinGroundTime(this, 'fp02', "出現時間(Min)", 20.0f, 0.0f, 100.0f)                   // 'appearance time (min)'
+		    , mAirborneTime(this, 'fp03', "出現間隔", 3.0f, 0.0f, 100.0f)                          // 'appearance interval'
+		    , mMinWhistleTime(this, 'fp11', "フエ間隔(1)", 0.0f, 0.0f, 5.0f)                       // 'hue interval (1)
+		    , mMaxWhistleTimeNoSquad(this, 'fp12', "フエ間隔(2～:隊列ナシ)", 5.0f, 0.0f, 10.0f)    // 'hue interval (2 ~: no formation)'
+		    , mMaxWhistleTimeWithSquad(this, 'fp13', "フエ間隔(2～:隊列アリ)", 10.0f, 0.0f, 20.0f) // 'hue interval (2 ~: platoon ants)'
+		    , mStruggleTime(this, 'fp21', "もがき時間", 3.0f, 0.0f, 10.0f)                         // 'struggling time'
+		    , mJumpTime(this, 'fp22', "逃げジャンプ時間", 0.0f, 0.0f, 5.0f)                        // 'escape jump time'
+		    , mNormalLandingChance(this, 'fp31', "通常出現率", 0.5f, 0.0f, 1.0f)                   // 'normal appearance rate'
 		{
 		}

--- a/include/Game/Entities/GasHiba.h
+++ b/include/Game/Entities/GasHiba.h
@ -99,10 +99,10 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mWaitTime(this, 'fp02', "ウェイト時間", 2.5f, 0.0f, 100.0f)        // 'wait time'
-		    , mActiveTime(this, 'fp01', "ガス吐き時間", 2.5f, 0.0f, 100.0f)      // 'gas discharge time'
-		    , mAttackStartTime(this, 'fp03', "攻撃開始時間", 1.0f, 0.0f, 100.0f) // 'attack start time'
-		    , mStopTime(this, 'fp04', "停止時間", 10.0f, 0.0f, 100.0f)           // 'stop time'
+		    , mWaitTime(this, 'fp02', "ウェイト時間", 2.5f, 0.0f, 100.0f)        // 'wait time'
+		    , mActiveTime(this, 'fp01', "ガス吐き時間", 2.5f, 0.0f, 100.0f)      // 'gas discharge time'
+		    , mAttackStartTime(this, 'fp03', "攻撃開始時間", 1.0f, 0.0f, 100.0f) // 'attack start time'
+		    , mStopTime(this, 'fp04', "停止時間", 10.0f, 0.0f, 100.0f)           // 'stop time'
 		    , mLodNear(this, 'fp90', "LOD NEAR", 0.085f, 0.0f, 1.0f)
 		    , mLodMiddle(this, 'fp91', "LOD MIDDLE", 0.05f, 0.0f, 1.0f)
 		{
--- a/include/Game/Entities/Hanachirashi.h
+++ b/include/Game/Entities/Hanachirashi.h
@ -153,14 +153,14 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mStandardFlightHeight(this, 'fp01', "基準飛行高さ", 90.0f, 0.0f, 150.0f) // 'standard flight height'
-		    , mRiseFactor(this, 'fp02', "上昇係数", 1.0f, 0.0f, 10.0f)                 // 'rise factor'
-		    , mAirWaitTime(this, 'fp03', "空中ウェイト時間", 3.0f, 0.0f, 10.0f)        // 'air wait time'
-		    , mGroundWaitTime(this, 'fp10', "地上ウェイト時間", 3.0f, 0.0f, 10.0f)     // 'ground wait time'
-		    , mShakeOffTime(this, 'fp04', "振払落下時間", 3.0f, 0.0f, 10.0f)           // 'shake off time'
-		    , mFallingMinimumPikiNum(this, 'ip01', "落下最低ピキ数", 10, 1, 50)        // 'falling minimum number piki'
-		    , mVerticalSwingSpeed(this, 'fp05', "上下の揺れ速度", 2.5f, 0.0f, 10.0f)   // 'vertical swing speed'
-		    , mVerticalSwingWidth(this, 'fp06', "上下の揺れ幅", 5.0f, 0.0f, 10.0f)     // 'vertical swing width'
+		    , mStandardFlightHeight(this, 'fp01', "基準飛行高さ", 90.0f, 0.0f, 150.0f) // 'standard flight height'
+		    , mRiseFactor(this, 'fp02', "上昇係数", 1.0f, 0.0f, 10.0f)                 // 'rise factor'
+		    , mAirWaitTime(this, 'fp03', "空中ウェイト時間", 3.0f, 0.0f, 10.0f)        // 'air wait time'
+		    , mGroundWaitTime(this, 'fp10', "地上ウェイト時間", 3.0f, 0.0f, 10.0f)     // 'ground wait time'
+		    , mShakeOffTime(this, 'fp04', "振払落下時間", 3.0f, 0.0f, 10.0f)           // 'shake off time'
+		    , mFallingMinimumPikiNum(this, 'ip01', "落下最低ピキ数", 10, 1, 50)        // 'falling minimum number piki'
+		    , mVerticalSwingSpeed(this, 'fp05', "上下の揺れ速度", 2.5f, 0.0f, 10.0f)   // 'vertical swing speed'
+		    , mVerticalSwingWidth(this, 'fp06', "上下の揺れ幅", 5.0f, 0.0f, 10.0f)     // 'vertical swing width'
 		{
 		}

--- a/include/Game/Entities/Hiba.h
+++ b/include/Game/Entities/Hiba.h
@ -86,9 +86,9 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mWaitTime(this, 'fp02', "ウェイト時間", 2.5f, 0.0f, 100.0f) // 'wait time'
-		    , mActiveTime(this, 'fp01', "火吐き時間", 2.5f, 0.0f, 100.0f) // 'fire spitting time'
-		    , mStopTime(this, 'fp03', "停止時間", 10.0f, 0.0f, 100.0f)    // 'stop time'
+		    , mWaitTime(this, 'fp02', "ウェイト時間", 2.5f, 0.0f, 100.0f) // 'wait time'
+		    , mActiveTime(this, 'fp01', "火吐き時間", 2.5f, 0.0f, 100.0f) // 'fire spitting time'
+		    , mStopTime(this, 'fp03', "停止時間", 10.0f, 0.0f, 100.0f)    // 'stop time'
 		    , mLodNear(this, 'fp90', "LOD NEAR", 0.085f, 0.0f, 1.0f)
 		    , mLodMiddle(this, 'fp91', "LOD MIDDLE", 0.05f, 0.0f, 1.0f)
 		{
--- a/include/Game/Entities/Houdai.h
+++ b/include/Game/Entities/Houdai.h
@ -201,16 +201,16 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mBaseFactor(this, 'fp01', "ベース係数", 5.0f, 0.0f, 10.0f)                 // 'base factor'
-		    , mRaiseDecelFactor(this, 'fp02', "上げ減速係数", -0.4f, -5.0f, 5.0f)        // 'raising deceleration factor'
-		    , mDownwardAccelFactor(this, 'fp03', "下げ加速係数", 0.5f, -5.0f, 5.0f)      // 'downward acceleration factor'
-		    , mMinDecelAccelFactor(this, 'fp04', "最低減加速係数", -3.0f, -10.0f, 10.0f) // 'minimum deceleration acceleration factor'
-		    , mMaxDecelAccelFactor(this, 'fp05', "最高減加速係数", 10.0f, -10.0f, 10.0f) // 'maximum deceleration acceleration factor'
-		    , mLegSwing(this, 'fp06', "足の振り上げ", 90.0f, 0.0f, 200.0f)               // 'leg swing'
-		    , mMaxShootingOn(this, 'fp10', "射撃On:Max", 2.0f, 0.0f, 10.0f)              // 'shooting on:max'
-		    , mMinShootingOn(this, 'fp11', "射撃On:Min", 1.0f, 0.0f, 10.0f)              // 'shooting on:min'
-		    , mMaxShootingOff(this, 'fp12', "射撃Off:Max", 1.0f, 0.0f, 10.0f)            // 'shooting off:max'
-		    , mMinShootingOff(this, 'fp13', "射撃Off:Min", 0.5f, 0.0f, 10.0f)            // 'shooting off:min'
+		    , mBaseFactor(this, 'fp01', "ベース係数", 5.0f, 0.0f, 10.0f)                 // 'base factor'
+		    , mRaiseDecelFactor(this, 'fp02', "上げ減速係数", -0.4f, -5.0f, 5.0f)        // 'raising deceleration factor'
+		    , mDownwardAccelFactor(this, 'fp03', "下げ加速係数", 0.5f, -5.0f, 5.0f)      // 'downward acceleration factor'
+		    , mMinDecelAccelFactor(this, 'fp04', "最低減加速係数", -3.0f, -10.0f, 10.0f) // 'minimum deceleration acceleration factor'
+		    , mMaxDecelAccelFactor(this, 'fp05', "最高減加速係数", 10.0f, -10.0f, 10.0f) // 'maximum deceleration acceleration factor'
+		    , mLegSwing(this, 'fp06', "足の振り上げ", 90.0f, 0.0f, 200.0f)               // 'leg swing'
+		    , mMaxShootingOn(this, 'fp10', "射撃On:Max", 2.0f, 0.0f, 10.0f)              // 'shooting on:max'
+		    , mMinShootingOn(this, 'fp11', "射撃On:Min", 1.0f, 0.0f, 10.0f)              // 'shooting on:min'
+		    , mMaxShootingOff(this, 'fp12', "射撃Off:Max", 1.0f, 0.0f, 10.0f)            // 'shooting off:max'
+		    , mMinShootingOff(this, 'fp13', "射撃Off:Min", 0.5f, 0.0f, 10.0f)            // 'shooting off:min'
 		    , mLastToTerritory(this, 'fp20', "Last 2 Territory", 380.0f, 0.0f, 500.0f)   // 'Last 2 Territory'
 		{
 		}
--- a/include/Game/Entities/Imomushi.h
+++ b/include/Game/Entities/Imomushi.h
@ -132,11 +132,11 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mPlantClimbingSpeed(this, 'fp01', "草登り速度", 2.0f, 0.0f, 10.0f)        // 'plant climbing speed'
-		    , mSeedCirculationSpeed(this, 'fp02', "種周回速度", 0.3f, 0.0f, 10.0f)      // 'seed circulation speed'
-		    , mEatingTime(this, 'fp11', "実食い時間", 10.0f, 0.0f, 100.0f)              // 'eating time'
-		    , mTranslationCorrection(this, 'fp90', "Translate補正", 0.75f, 0.0f, 10.0f) // 'translation correction'
-		    , mRotationCorrection(this, 'fp91', "Rotate補正", 0.05f, 0.0f, 1.0f)        // 'rotation correction'
+		    , mPlantClimbingSpeed(this, 'fp01', "草登り速度", 2.0f, 0.0f, 10.0f)        // 'plant climbing speed'
+		    , mSeedCirculationSpeed(this, 'fp02', "種周回速度", 0.3f, 0.0f, 10.0f)      // 'seed circulation speed'
+		    , mEatingTime(this, 'fp11', "実食い時間", 10.0f, 0.0f, 100.0f)              // 'eating time'
+		    , mTranslationCorrection(this, 'fp90', "Translate補正", 0.75f, 0.0f, 10.0f) // 'translation correction'
+		    , mRotationCorrection(this, 'fp91', "Rotate補正", 0.05f, 0.0f, 1.0f)        // 'rotation correction'
 		{
 		}

--- a/include/Game/Entities/ItemBarrel.h
+++ b/include/Game/Entities/ItemBarrel.h
@ -109,7 +109,7 @@ struct BarrelParms : public CreatureParms {
 	struct Parms : public Parameters {
 		inline Parms()
 		    : Parameters(nullptr, "Barrel::Parms")
-		    , mHealth(this, 'p000', "ライフ", 100.0f, 1.0f, 60000.0f) // 'life'
+		    , mHealth(this, 'p000', "ライフ", 100.0f, 1.0f, 60000.0f) // 'life'
 		{
 		}

--- a/include/Game/Entities/ItemBigFountain.h
+++ b/include/Game/Entities/ItemBigFountain.h
@ -121,7 +121,7 @@ struct FountainParms : public CreatureParms {
 	struct Parms : public Parameters {
 		inline Parms() // probably
 		    : Parameters(nullptr, "Fountain::Parms")
-		    , mHealth(this, 'p000', "ライフ", 1000.0f, 1.0f, 60000.0f) // 'life'
+		    , mHealth(this, 'p000', "ライフ", 1000.0f, 1.0f, 60000.0f) // 'life'
 		{
 		}

--- a/include/Game/Entities/ItemBridge.h
+++ b/include/Game/Entities/ItemBridge.h
@ -80,7 +80,7 @@ struct BridgeParms : public CreatureParms {
 	struct Parms : public Parameters {
 		inline Parms()
 		    : Parameters(nullptr, "Bridge::Parms")
-		    , mHealth(this, 'p000', "ライフ", 100.0f, 0.0f, 40000.0f) // 'life'
+		    , mHealth(this, 'p000', "ライフ", 100.0f, 0.0f, 40000.0f) // 'life'
 		{
 		}

--- a/include/Game/Entities/ItemPlant.h
+++ b/include/Game/Entities/ItemPlant.h
@ -161,12 +161,12 @@ struct PlantParms : public CreatureParms {
 	struct Parms : public Parameters {
 		Parms()
 		    : Parameters(nullptr, "Plant::Parms")
-		    , mGrowTimeToMedium(this, 'p000', "成長時間(小→中)", 10.0f, 0.0f, 2000.0f)  // 'growth time (small -> medium)'
-		    , mGrowTimeToLarge(this, 'p001', "成長時間(中→大)", 10.0f, 0.0f, 2000.0f)   // 'growth time (medium -> large)'
-		    , mDamageToDrop(this, 'p002', "ドロップするダメージ", 300.0f, 0.0f, 2500.0f) // 'damage to drop'
-		    , mBearFruitTime(this, 'p003', "実をつけるまでの時間", 10.0f, 0.0f, 2000.0f) // 'time to bear fruit'
-		    , mActualPlayTime(this, 'p004', "実再生時間", 20.0f, 0.0f, 2000.0f)          // 'actual play time'
-		    , mBurstTime(this, 'p005', "腐るまでの時間", 40.0f, 0.0f, 10000.0f)          // 'time to rot/spoil'
+		    , mGrowTimeToMedium(this, 'p000', "成長時間(小→中)", 10.0f, 0.0f, 2000.0f)  // 'growth time (small -> medium)'
+		    , mGrowTimeToLarge(this, 'p001', "成長時間(中→大)", 10.0f, 0.0f, 2000.0f)   // 'growth time (medium -> large)'
+		    , mDamageToDrop(this, 'p002', "ドロップするダメージ", 300.0f, 0.0f, 2500.0f) // 'damage to drop'
+		    , mBearFruitTime(this, 'p003', "実をつけるまでの時間", 10.0f, 0.0f, 2000.0f) // 'time to bear fruit'
+		    , mActualPlayTime(this, 'p004', "実再生時間", 20.0f, 0.0f, 2000.0f)          // 'actual play time'
+		    , mBurstTime(this, 'p005', "腐るまでの時間", 40.0f, 0.0f, 10000.0f)          // 'time to rot/spoil'
 		{
 		}

--- a/include/Game/Entities/ItemRock.h
+++ b/include/Game/Entities/ItemRock.h
@ -93,17 +93,17 @@ struct RockParms : public CreatureParms {
 	struct Parms : public Parameters {
 		Parms()
 		    : Parameters(nullptr, "Plant::Parms")
-		    , mHealthMax(this, 'p000', "ライフ(0)", 1500.0f, 1.0f, 60000.0f)        // 'life (0)'
-		    , mHealthMedium(this, 'p001', "ライフ(1)", 1200.0f, 1.0f, 60000.0f)     // 'life (1)'
-		    , mHealthSmall(this, 'p002', "ライフ(2)", 750.0f, 1.0f, 60000.0f)       // 'life (2)'
-		    , mHealthHidden(this, 'p003', "ライフ(3)", 250.0f, 1.0f, 60000.0f)      // 'life (3)'
-		    , mGrowTimeMax(this, 'p004', "再生時間(0) [分]", 1.0f, 0.0f, 150.0f)    // 'play time (0) [minutes]'
-		    , mGrowTimeMedium(this, 'p005', "再生時間(1) [分]", 1.0f, 0.0f, 150.0f) // 'play time (1) [minutes]'
-		    , mGrowTimeSmall(this, 'p006', "再生時間(2) [分]", 1.0f, 0.0f, 150.0f)  // 'play time (2) [minutes]'
-		    , mGrowTimeHidden(this, 'p007', "再生時間(3) [分]", 1.0f, 0.0f, 150.0f) // 'play time (3) [minutes]'
-		    , mWorkRadiusMax(this, 'p008', "仕事半径(0)", 35.0f, 0.0f, 150.0f)      // 'work radius (0)'
-		    , mWorkRadiusMedium(this, 'p009', "仕事半径(0)", 20.0f, 0.0f, 150.0f)   // 'work radius (0)' (should be (1))
-		    , mWorkRadiusSmall(this, 'p010', "仕事半径(0)", 10.0f, 0.0f, 150.0f)    // 'work radius (0)' (should be (2))
+		    , mHealthMax(this, 'p000', "ライフ(0)", 1500.0f, 1.0f, 60000.0f)        // 'life (0)'
+		    , mHealthMedium(this, 'p001', "ライフ(1)", 1200.0f, 1.0f, 60000.0f)     // 'life (1)'
+		    , mHealthSmall(this, 'p002', "ライフ(2)", 750.0f, 1.0f, 60000.0f)       // 'life (2)'
+		    , mHealthHidden(this, 'p003', "ライフ(3)", 250.0f, 1.0f, 60000.0f)      // 'life (3)'
+		    , mGrowTimeMax(this, 'p004', "再生時間(0) [分]", 1.0f, 0.0f, 150.0f)    // 'play time (0) [minutes]'
+		    , mGrowTimeMedium(this, 'p005', "再生時間(1) [分]", 1.0f, 0.0f, 150.0f) // 'play time (1) [minutes]'
+		    , mGrowTimeSmall(this, 'p006', "再生時間(2) [分]", 1.0f, 0.0f, 150.0f)  // 'play time (2) [minutes]'
+		    , mGrowTimeHidden(this, 'p007', "再生時間(3) [分]", 1.0f, 0.0f, 150.0f) // 'play time (3) [minutes]'
+		    , mWorkRadiusMax(this, 'p008', "仕事半径(0)", 35.0f, 0.0f, 150.0f)      // 'work radius (0)'
+		    , mWorkRadiusMedium(this, 'p009', "仕事半径(0)", 20.0f, 0.0f, 150.0f)   // 'work radius (0)' (should be (1))
+		    , mWorkRadiusSmall(this, 'p010', "仕事半径(0)", 10.0f, 0.0f, 150.0f)    // 'work radius (0)' (should be (2))
 		{
 		}

--- a/include/Game/Entities/ItemTreasure.h
+++ b/include/Game/Entities/ItemTreasure.h
@ -103,10 +103,10 @@ struct TreasureParms : public CreatureParms {
 	struct Parms : public Parameters {
 		inline Parms()
 		    : Parameters(nullptr, "Plant::Parms")
-		    , mLife0(this, 'p000', "ライフ(0)", 250.0f, 1.0f, 60000.0f)  // 'life (0)'
-		    , mLife1(this, 'p001', "ライフ(1)", 750.0f, 1.0f, 60000.0f)  // 'life (1)'
-		    , mLife2(this, 'p002', "ライフ(2)", 1200.0f, 1.0f, 60000.0f) // 'life (2)'
-		    , mLife3(this, 'p003', "ライフ(3)", 1500.0f, 1.0f, 60000.0f) // 'life (3)'
+		    , mLife0(this, 'p000', "ライフ(0)", 250.0f, 1.0f, 60000.0f)  // 'life (0)'
+		    , mLife1(this, 'p001', "ライフ(1)", 750.0f, 1.0f, 60000.0f)  // 'life (1)'
+		    , mLife2(this, 'p002', "ライフ(2)", 1200.0f, 1.0f, 60000.0f) // 'life (2)'
+		    , mLife3(this, 'p003', "ライフ(3)", 1500.0f, 1.0f, 60000.0f) // 'life (3)'
 		{
 		}

--- a/include/Game/Entities/Jigumo.h
+++ b/include/Game/Entities/Jigumo.h
@ -95,12 +95,12 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mCarrySpeed(this, 'fp01', "運搬速度", 100.0f, 0.0f, 300.0f)      // 'transport speed'
-		    , mReturnSpeed(this, 'fp02', "戻り速度", 100.0f, 0.0f, 300.0f)     // 'return speed'
-		    , mMinScale(this, 'fp03', "スケール最小", 1.0f, 0.0f, 3.0f)        // 'scale minimum'
-		    , mMaxScale(this, 'fp04', "スケール最大", 1.2f, 0.0f, 3.0f)        // 'scale maximum'
-		    , mPoisonDamage(this, 'fp05', "白ピクミン", 300.0f, 0.0f, 1000.0f) // 'white pikmin'
-		    , mHidingTime(this, 'ip01', "隠れている時間", 30, 0, 120)          // 'hiding time'
+		    , mCarrySpeed(this, 'fp01', "運搬速度", 100.0f, 0.0f, 300.0f)      // 'transport speed'
+		    , mReturnSpeed(this, 'fp02', "戻り速度", 100.0f, 0.0f, 300.0f)     // 'return speed'
+		    , mMinScale(this, 'fp03', "スケール最小", 1.0f, 0.0f, 3.0f)        // 'scale minimum'
+		    , mMaxScale(this, 'fp04', "スケール最大", 1.2f, 0.0f, 3.0f)        // 'scale maximum'
+		    , mPoisonDamage(this, 'fp05', "白ピクミン", 300.0f, 0.0f, 1000.0f) // 'white pikmin'
+		    , mHidingTime(this, 'ip01', "隠れている時間", 30, 0, 120)          // 'hiding time'
 		{
 		}

--- a/include/Game/Entities/KingChappy.h
+++ b/include/Game/Entities/KingChappy.h
@ -48,30 +48,30 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mRequiredTurningAngleDeg(this, 'fp01', "要旋回角度(deg)", 20.0f, 0.0f, 180.0f)     // 'required turning angle (deg)'
-		    , mDistanceToSpawn(this, 'fp02', "出現までの距離", 150.0f, 0.0f, 300.0f)             // 'distance to spawn'
-		    , mRoarEffectiveAngleDeg(this, 'fp03', "雄たけび有効角度(deg)", 45.0f, 0.0f, 180.0f) // 'roar effective angle (deg)'
-		    , mRoarEffectiveRange(this, 'fp04', "雄たけび有効範囲", 100.0f, 0.0f, 300.0f)        // 'roar effective range'
-		    , mBombDamage(this, 'fp05', "爆弾ダメージ", 200.0f, 0.0f, 600.0f)                    // 'bomb damage'
-		    , mInvisibleRange(this, 'fp06', "見えない範囲", 70.0f, 0.0f, 200.0f)                 // 'invisible range'
-		    , mTurningEndAngle(this, 'fp07', "旋回終了角度", 10.0f, 0.0f, 180.0f)                // 'turning end angle'
-		    , mTramplingRange(this, 'fp08', "踏み潰し範囲", 45.0f, 0.0f, 200.0f)                 // 'trampling range'
-		    , mAppearanceShakeOffRange(this, 'fp09', "出現振り払い範囲", 100.0f, 0.0f, 200.0f)   // 'appearance shake-off range'
-		    , mAppearanceShakeOffPower(this, 'fp10', "出現振り払い力", 200.0f, 0.0f, 400.0f)     // 'appearance shake-off power'
-		    , mWalkingAnimeSpeed(this, 'fp11', "歩きアニメスピード", 1.0f, 0.0f, 3.0f)           // 'walking anime speed'
-		    , mDeathRate(this, 'fp12', "死雄たけび率", 0.0f, 0.0f, 1.0f)                         // 'death rate'
-		    , mFlickShoutRate(this, 'fp13', "フリック雄たけび率", 0.5f, 0.0f, 1.0f)              // 'flick shout rate'
-		    , mWhitePikmin(this, 'fp14', "白ピクミン", 300.0f, 0.0f, 1000.0f)                    // 'white pikmin'
-		    , mBigScale(this, 'fp15', "bigスケール", 1.0f, 1.0f, 2.0f)                           // 'big scale'
-		    , mBigLife(this, 'fp16', "bigライフ", 100.0f, 0.0f, 9999.0f)                         // 'big life'
-		    , mBigSpeed(this, 'fp17', "big速度", 80.0f, 0.0f, 1000.0f)                           // 'big speed'
-		    , mBigRotationSpeedRate(this, 'fp18', "big回転速度率", 0.1f, 0.0f, 1.0f)             // 'big rotation speed rate'
-		    , mBigRotationMaxSpeed(this, 'fp19', "big回転最大速度", 10.0f, 0.0f, 360.0f)         // 'big rotation maximum speed'
-		    , mBigAttackAngle(this, 'fp20', "big攻撃可能\角度", 15.0f, 0.0f, 180.0f)             // 'big attack angle'
-		    , mBigAttackHitRange(this, 'fp21', "big攻撃ヒット範囲", 70.0f, 0.0f, 1000.0f)        // 'big attack hit range'
-		    , mPeriodOfIncubation(this, 'ip01', "潜伏までの期間", 500, 0, 2000)                  // 'period of incubation'
-		    , mTimeToAppearance(this, 'ip02', "出現までの期間", 200, 0, 1000)                    // 'time to appearance'
-		    , mBombDamageTime(this, 'ip03', "爆弾ダメージ時間", 10, 0, 200)                      // 'bomb damage time'
+		    , mRequiredTurningAngleDeg(this, 'fp01', "要旋回角度(deg)", 20.0f, 0.0f, 180.0f)     // 'required turning angle (deg)'
+		    , mDistanceToSpawn(this, 'fp02', "出現までの距離", 150.0f, 0.0f, 300.0f)             // 'distance to spawn'
+		    , mRoarEffectiveAngleDeg(this, 'fp03', "雄たけび有効角度(deg)", 45.0f, 0.0f, 180.0f) // 'roar effective angle (deg)'
+		    , mRoarEffectiveRange(this, 'fp04', "雄たけび有効範囲", 100.0f, 0.0f, 300.0f)        // 'roar effective range'
+		    , mBombDamage(this, 'fp05', "爆弾ダメージ", 200.0f, 0.0f, 600.0f)                    // 'bomb damage'
+		    , mInvisibleRange(this, 'fp06', "見えない範囲", 70.0f, 0.0f, 200.0f)                 // 'invisible range'
+		    , mTurningEndAngle(this, 'fp07', "旋回終了角度", 10.0f, 0.0f, 180.0f)                // 'turning end angle'
+		    , mTramplingRange(this, 'fp08', "踏み潰し範囲", 45.0f, 0.0f, 200.0f)                 // 'trampling range'
+		    , mAppearanceShakeOffRange(this, 'fp09', "出現振り払い範囲", 100.0f, 0.0f, 200.0f)   // 'appearance shake-off range'
+		    , mAppearanceShakeOffPower(this, 'fp10', "出現振り払い力", 200.0f, 0.0f, 400.0f)     // 'appearance shake-off power'
+		    , mWalkingAnimeSpeed(this, 'fp11', "歩きアニメスピード", 1.0f, 0.0f, 3.0f)           // 'walking anime speed'
+		    , mDeathRate(this, 'fp12', "死雄たけび率", 0.0f, 0.0f, 1.0f)                         // 'death rate'
+		    , mFlickShoutRate(this, 'fp13', "フリック雄たけび率", 0.5f, 0.0f, 1.0f)              // 'flick shout rate'
+		    , mWhitePikmin(this, 'fp14', "白ピクミン", 300.0f, 0.0f, 1000.0f)                    // 'white pikmin'
+		    , mBigScale(this, 'fp15', "bigスケール", 1.0f, 1.0f, 2.0f)                           // 'big scale'
+		    , mBigLife(this, 'fp16', "bigライフ", 100.0f, 0.0f, 9999.0f)                         // 'big life'
+		    , mBigSpeed(this, 'fp17', "big速度", 80.0f, 0.0f, 1000.0f)                           // 'big speed'
+		    , mBigRotationSpeedRate(this, 'fp18', "big回転速度率", 0.1f, 0.0f, 1.0f)             // 'big rotation speed rate'
+		    , mBigRotationMaxSpeed(this, 'fp19', "big回転最大速度", 10.0f, 0.0f, 360.0f)         // 'big rotation maximum speed'
+		    , mBigAttackAngle(this, 'fp20', "big攻撃可能\角度", 15.0f, 0.0f, 180.0f)             // 'big attack angle'
+		    , mBigAttackHitRange(this, 'fp21', "big攻撃ヒット範囲", 70.0f, 0.0f, 1000.0f)        // 'big attack hit range'
+		    , mPeriodOfIncubation(this, 'ip01', "潜伏までの期間", 500, 0, 2000)                  // 'period of incubation'
+		    , mTimeToAppearance(this, 'ip02', "出現までの期間", 200, 0, 1000)                    // 'time to appearance'
+		    , mBombDamageTime(this, 'ip03', "爆弾ダメージ時間", 10, 0, 200)                      // 'bomb damage time'
 		{
 		}

--- a/include/Game/Entities/KochappyBase.h
+++ b/include/Game/Entities/KochappyBase.h
@ -102,9 +102,9 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mAbsentMindedTime(this, 'fp01', "ぼんやり時間", 2.0f, 0.0f, 100.0f)  // 'absentminded time'
-		    , mPoisonDamage(this, 'fp02', "白ピクミン毒", 300.0f, 0.0f, 1000.0f)   // 'white pikmin poison'
-		    , mRotationEndAngle(this, 'fp03', "回転終了角度", 90.0f, 0.0f, 180.0f) // 'rotation end angle'
+		    , mAbsentMindedTime(this, 'fp01', "ぼんやり時間", 2.0f, 0.0f, 100.0f)  // 'absentminded time'
+		    , mPoisonDamage(this, 'fp02', "白ピクミン毒", 300.0f, 0.0f, 1000.0f)   // 'white pikmin poison'
+		    , mRotationEndAngle(this, 'fp03', "回転終了角度", 90.0f, 0.0f, 180.0f) // 'rotation end angle'
 		{
 		}

--- a/include/Game/Entities/Kogane.h
+++ b/include/Game/Entities/Kogane.h
@ -109,14 +109,14 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mMinAppearTime(this, 'fp01', "出現時間(Min)", 15.0f, 0.0f, 100.0f) // 'appearance time (Min)'
-		    , mMaxAppearTime(this, 'fp02', "出現時間(Max)", 30.0f, 0.0f, 100.0f) // 'appearance time (Max)'
-		    , mMinTravelTime(this, 'fp10', "移動時間(Min)", 0.5f, 0.0f, 10.0f)   // 'travel time (Min)'
-		    , mMaxTravelTime(this, 'fp11', "移動時間(Max)", 2.0f, 0.0f, 10.0f)   // 'travel time (Max)'
-		    , mMinStopTime(this, 'fp20', "停止時間(Min)", 0.5f, 0.0f, 10.0f)     // 'stop time (Min)'
-		    , mMaxStopTime(this, 'fp21', "停止時間(Max)", 2.0f, 0.0f, 10.0f)     // 'stop time (Max)'
-		    , mTurnAngle(this, 'fp30', "向き変え角度", 45.0f, 0.0f, 90.0f)       // 'turning angle'
-		    , mScale(this, 'fp40', "スケール", 0.8f, 0.0f, 5.0f)                 // 'scale'
+		    , mMinAppearTime(this, 'fp01', "出現時間(Min)", 15.0f, 0.0f, 100.0f) // 'appearance time (Min)'
+		    , mMaxAppearTime(this, 'fp02', "出現時間(Max)", 30.0f, 0.0f, 100.0f) // 'appearance time (Max)'
+		    , mMinTravelTime(this, 'fp10', "移動時間(Min)", 0.5f, 0.0f, 10.0f)   // 'travel time (Min)'
+		    , mMaxTravelTime(this, 'fp11', "移動時間(Max)", 2.0f, 0.0f, 10.0f)   // 'travel time (Max)'
+		    , mMinStopTime(this, 'fp20', "停止時間(Min)", 0.5f, 0.0f, 10.0f)     // 'stop time (Min)'
+		    , mMaxStopTime(this, 'fp21', "停止時間(Max)", 2.0f, 0.0f, 10.0f)     // 'stop time (Max)'
+		    , mTurnAngle(this, 'fp30', "向き変え角度", 45.0f, 0.0f, 90.0f)       // 'turning angle'
+		    , mScale(this, 'fp40', "スケール", 0.8f, 0.0f, 5.0f)                 // 'scale'
 		{
 		}

--- a/include/Game/Entities/KumaChappy.h
+++ b/include/Game/Entities/KumaChappy.h
@ -115,9 +115,9 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mPoisonDamage(this, 'fp01', "白ピクミン", 300.0f, 0.0f, 10000.0f)          // eat white pikmin damage
-		    , mHealthGaugeTimer(this, 'fp11', "死亡 ～ ゲージ出現", 30.0f, 1.0f, 500.0f) // 'death ~ gauge appears`
-		    , mRespawnRate(this, 'fp12', "ゲージ出現 ～ 復活", 10.0f, 1.0f, 500.0f)      // 'gauge appears ~ revival'
+		    , mPoisonDamage(this, 'fp01', "白ピクミン", 300.0f, 0.0f, 10000.0f)          // eat white pikmin damage
+		    , mHealthGaugeTimer(this, 'fp11', "死亡 ～ ゲージ出現", 30.0f, 1.0f, 500.0f) // 'death ~ gauge appears`
+		    , mRespawnRate(this, 'fp12', "ゲージ出現 ～ 復活", 10.0f, 1.0f, 500.0f)      // 'gauge appears ~ revival'
 		{
 		}

--- a/include/Game/Entities/KumaKochappy.h
+++ b/include/Game/Entities/KumaKochappy.h
@ -107,7 +107,7 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mPoisonDamage(this, 'fp01', "白ピクミン", 300.0f, 0.0f, 10000.0f) // 'white pikmin'
+		    , mPoisonDamage(this, 'fp01', "白ピクミン", 300.0f, 0.0f, 10000.0f) // 'white pikmin'
 		{
 		}

--- a/include/Game/Entities/Kurage.h
+++ b/include/Game/Entities/Kurage.h
@ -132,14 +132,14 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mFlightHeight(this, 'fp01', "飛行高さ", 90.0f, 0.0f, 150.0f)     // 'flight height'
-		    , mRiseFactor(this, 'fp02', "上昇係数", 1.0f, 0.0f, 10.0f)         // 'rise factor'
-		    , mGroundTime(this, 'fp10', "地上ウェイト時間", 3.0f, 0.0f, 10.0f) // 'ground wait time'
-		    , mSuckTime(this, 'fp11', "吸い込み時間", 5.0f, 0.0f, 10.0f)       // 'suction time'
-		    , mSuckChance(this, 'fp12', "吸い込み確率", 0.025f, 0.0f, 1.0f)    // 'suction probability'
-		    , mShakeTime(this, 'fp04', "振払落下時間", 3.0f, 0.0f, 10.0f)      // 'shake off time'
-		    , mMinFallPiki(this, 'ip01', "落下最低ピキ数", 10, 1, 50)          // 'falling minimum piki number'
-		    , mMaxSuckPiki(this, 'ip11', "吸い込みピキ数", 10, 1, 100)         // 'sucking piki number'
+		    , mFlightHeight(this, 'fp01', "飛行高さ", 90.0f, 0.0f, 150.0f)     // 'flight height'
+		    , mRiseFactor(this, 'fp02', "上昇係数", 1.0f, 0.0f, 10.0f)         // 'rise factor'
+		    , mGroundTime(this, 'fp10', "地上ウェイト時間", 3.0f, 0.0f, 10.0f) // 'ground wait time'
+		    , mSuckTime(this, 'fp11', "吸い込み時間", 5.0f, 0.0f, 10.0f)       // 'suction time'
+		    , mSuckChance(this, 'fp12', "吸い込み確率", 0.025f, 0.0f, 1.0f)    // 'suction probability'
+		    , mShakeTime(this, 'fp04', "振払落下時間", 3.0f, 0.0f, 10.0f)      // 'shake off time'
+		    , mMinFallPiki(this, 'ip01', "落下最低ピキ数", 10, 1, 50)          // 'falling minimum piki number'
+		    , mMaxSuckPiki(this, 'ip11', "吸い込みピキ数", 10, 1, 100)         // 'sucking piki number'
 		{
 		}

--- a/include/Game/Entities/Mar.h
+++ b/include/Game/Entities/Mar.h
@ -145,14 +145,14 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mStandardFlightHeight(this, 'fp01', "基準飛行高さ", 90.0f, 0.0f, 150.0f) // 'standard flight height'
-		    , mRiseFactor(this, 'fp02', "上昇係数", 1.0f, 0.0f, 10.0f)                 // 'rise factor'
-		    , mAirWaitTime(this, 'fp03', "空中ウェイト時間", 3.0f, 0.0f, 10.0f)        // 'air wait time'
-		    , mGroundWaitTime(this, 'fp10', "地上ウェイト時間", 3.0f, 0.0f, 10.0f)     // 'ground wait time'
-		    , mShakeOffTime(this, 'fp04', "振払落下時間", 3.0f, 0.0f, 10.0f)           // 'shake off time'
-		    , mFallingMinPikiNumber(this, 'ip01', "落下最低ピキ数", 10, 1, 50)         // 'falling minimum piki number'
-		    , mVerticalSwingSpeed(this, 'fp05', "上下の揺れ速度", 2.5f, 0.0f, 10.0f)   // 'vertical swing speed'
-		    , mVerticalSwingWidth(this, 'fp06', "上下の揺れ幅", 5.0f, 0.0f, 10.0f)     // 'vertical swing width'
+		    , mStandardFlightHeight(this, 'fp01', "基準飛行高さ", 90.0f, 0.0f, 150.0f) // 'standard flight height'
+		    , mRiseFactor(this, 'fp02', "上昇係数", 1.0f, 0.0f, 10.0f)                 // 'rise factor'
+		    , mAirWaitTime(this, 'fp03', "空中ウェイト時間", 3.0f, 0.0f, 10.0f)        // 'air wait time'
+		    , mGroundWaitTime(this, 'fp10', "地上ウェイト時間", 3.0f, 0.0f, 10.0f)     // 'ground wait time'
+		    , mShakeOffTime(this, 'fp04', "振払落下時間", 3.0f, 0.0f, 10.0f)           // 'shake off time'
+		    , mFallingMinPikiNumber(this, 'ip01', "落下最低ピキ数", 10, 1, 50)         // 'falling minimum piki number'
+		    , mVerticalSwingSpeed(this, 'fp05', "上下の揺れ速度", 2.5f, 0.0f, 10.0f)   // 'vertical swing speed'
+		    , mVerticalSwingWidth(this, 'fp06', "上下の揺れ幅", 5.0f, 0.0f, 10.0f)     // 'vertical swing width'
 		{
 		}

--- a/include/Game/Entities/MiniHoudai.h
+++ b/include/Game/Entities/MiniHoudai.h
@ -154,9 +154,9 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mHealthGaugeTimer(this, 'fp11', "死亡 ～ ゲージ出現", 30.0f, 1.0f,
+		    , mHealthGaugeTimer(this, 'fp11', "死亡 ～ ゲージ出現", 30.0f, 1.0f,
 		                        500.0f) // 'death ~ appearance of gauge' (Time from death -> health gauge)
-		    , mRespawnRate(this, 'fp12', "ゲージ出現 ～ 復活", 10.0f, 1.0f,
+		    , mRespawnRate(this, 'fp12', "ゲージ出現 ～ 復活", 10.0f, 1.0f,
 		                   500.0f) // 'appearance of gauge ~ resurrection' (Time from health gauge -> alive)
 		{
 		}
--- a/include/Game/Entities/Miulin.h
+++ b/include/Game/Entities/Miulin.h
@ -219,13 +219,13 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mReturnTime(this, 'ip01', "リターンカウンタ", 100, 0, 1000)                // 'return counter'
-		    , mContinuousPressAngle(this, 'fp03', "連続プレス角度", 20.0f, 0.0f, 180.0f) // 'continuous press angle'
-		    , mDashSpeedMultiplier(this, 'fp04', "ダッシュ速度倍率", 2.0f, 0.0f, 10.0f)  // 'dash speed multiplier'
-		    , mDashAnimationScale(this, 'fp05', "ダッシュアニメ倍率", 2.0f, 0.0f, 10.0f) // 'dash animation scale'
-		    , mMaxTurnAngle(this, 'fp06', "旋回終了角度", 10.0f, 0.0f, 180.0f)           // 'turning end angle'
-		    , mDashableAngle(this, 'fp07', "ダッシュ可能\角度", 30.0f, 0.0f, 180.0f)     // 'possible dash angle'
-		    , mMinAttackRange(this, 'fp08', "攻撃範囲最小", 25.0f, 0.0f, 100.0f)         // 'minimum attack range'
+		    , mReturnTime(this, 'ip01', "リターンカウンタ", 100, 0, 1000)                // 'return counter'
+		    , mContinuousPressAngle(this, 'fp03', "連続プレス角度", 20.0f, 0.0f, 180.0f) // 'continuous press angle'
+		    , mDashSpeedMultiplier(this, 'fp04', "ダッシュ速度倍率", 2.0f, 0.0f, 10.0f)  // 'dash speed multiplier'
+		    , mDashAnimationScale(this, 'fp05', "ダッシュアニメ倍率", 2.0f, 0.0f, 10.0f) // 'dash animation scale'
+		    , mMaxTurnAngle(this, 'fp06', "旋回終了角度", 10.0f, 0.0f, 180.0f)           // 'turning end angle'
+		    , mDashableAngle(this, 'fp07', "ダッシュ可能\角度", 30.0f, 0.0f, 180.0f)     // 'possible dash angle'
+		    , mMinAttackRange(this, 'fp08', "攻撃範囲最小", 25.0f, 0.0f, 100.0f)         // 'minimum attack range'
 		{
 		}

--- a/include/Game/Entities/OniKurage.h
+++ b/include/Game/Entities/OniKurage.h
@ -147,14 +147,14 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mFlightHeight(this, 'fp01', "飛行高さ", 90.0f, 0.0f, 150.0f)     // 'flight height'
-		    , mRiseFactor(this, 'fp02', "上昇係数", 1.0f, 0.0f, 10.0f)         // 'rise factor'
-		    , mGroundTime(this, 'fp10', "地上ウェイト時間", 3.0f, 0.0f, 10.0f) // 'ground wait time'
-		    , mSuckTime(this, 'fp11', "吸い込み時間", 5.0f, 0.0f, 10.0f)       // 'suction time'
-		    , mSuckChance(this, 'fp12', "吸い込み確率", 0.025f, 0.0f, 1.0f)    // 'suction probability'
-		    , mShakeTime(this, 'fp04', "振払落下時間", 3.0f, 0.0f, 10.0f)      // 'shake off time'
-		    , mMinFallPiki(this, 'ip01', "落下最低ピキ数", 10, 1, 50)          // 'falling minimum piki number'
-		    , mMaxSuckPiki(this, 'ip11', "吸い込みピキ数", 10, 1, 100)         // 'sucking piki number'
+		    , mFlightHeight(this, 'fp01', "飛行高さ", 90.0f, 0.0f, 150.0f)     // 'flight height'
+		    , mRiseFactor(this, 'fp02', "上昇係数", 1.0f, 0.0f, 10.0f)         // 'rise factor'
+		    , mGroundTime(this, 'fp10', "地上ウェイト時間", 3.0f, 0.0f, 10.0f) // 'ground wait time'
+		    , mSuckTime(this, 'fp11', "吸い込み時間", 5.0f, 0.0f, 10.0f)       // 'suction time'
+		    , mSuckChance(this, 'fp12', "吸い込み確率", 0.025f, 0.0f, 1.0f)    // 'suction probability'
+		    , mShakeTime(this, 'fp04', "振払落下時間", 3.0f, 0.0f, 10.0f)      // 'shake off time'
+		    , mMinFallPiki(this, 'ip01', "落下最低ピキ数", 10, 1, 50)          // 'falling minimum piki number'
+		    , mMaxSuckPiki(this, 'ip11', "吸い込みピキ数", 10, 1, 100)         // 'sucking piki number'
 		{
 		}

--- a/include/Game/Entities/OtakaraBase.h
+++ b/include/Game/Entities/OtakaraBase.h
@ -150,10 +150,10 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "OtakaraBaseParms")
-		    , mOtakaraLife(this, 'fp01', "オタカラライフ", 100.0f, 0.0f, 10000.0f) // 'otakara life'
-		    , mNormalAttack(this, 'fp10', "ノーマルアタック", 1.0f, 0.0f, 10.0f)   // 'normal attack'
-		    , mOtakaraAttack(this, 'fp11', "オタカラアタック", 1.25f, 0.0f, 10.0f) // 'otakara attack'
-		    , mTreasureCatch(this, 'fp21', "オタカラキャッチ", 2.5f, 0.0f, 10.0f)  // 'treasure catch'
+		    , mOtakaraLife(this, 'fp01', "オタカラライフ", 100.0f, 0.0f, 10000.0f) // 'otakara life'
+		    , mNormalAttack(this, 'fp10', "ノーマルアタック", 1.0f, 0.0f, 10.0f)   // 'normal attack'
+		    , mOtakaraAttack(this, 'fp11', "オタカラアタック", 1.25f, 0.0f, 10.0f) // 'otakara attack'
+		    , mTreasureCatch(this, 'fp21', "オタカラキャッチ", 2.5f, 0.0f, 10.0f)  // 'treasure catch'
 		{
 		}

--- a/include/Game/Entities/PanModokiBase.h
+++ b/include/Game/Entities/PanModokiBase.h
@ -191,16 +191,16 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mNestScale(this, 'fp00', "巣スケール", 1.0f, 0.0f, 5.0f)                 // 'nest scale'
-		    , mWalkAnimSpeed(this, 'fp16', "歩きモーションスピード", 1.0f, 0.0f, 5.0f) // 'walking motion speed'
-		    , mFastTurnSpeed(this, 'fp02', "急回転速度率", 0.1f, 0.0f, 1.0f)           // 'rapid rotation speed rate'
-		    , mMaxFastTurnAngle(this, 'fp05', "急回転速度最大", 1.0f, 0.0f, 180.0f)    // 'rapid rotation speed max'
-		    , mCarrySpeed(this, 'fp03', "戻り速度", 10.0f, 0.0f, 100.0f)               // 'return speed'
-		    , mSuckDamage(this, 'fp04', "コンテナダメージ", 10.0f, 0.0f, 1000.0f)      // 'container [onyon/ship] damage'
-		    , mPressDamage(this, 'fp06', "プレスダメージ", 10.0f, 0.0f, 1000.0f)       // 'press damage'
-		    , mWaitTime(this, 'fp14', "待機時間", 20.0f, 0.0f, 500.0f)                 // 'wait time'
-		    , mHideTime(this, 'fp15', "潜伏時間", 50.0f, 0.0f, 300.0f)                 // 'incubation time'
-		    , mMaxCarryWeight(this, 'ip01', "ターゲットスロット数境界", 5, 1, 20)      // 'target slot limit'
+		    , mNestScale(this, 'fp00', "巣スケール", 1.0f, 0.0f, 5.0f)                 // 'nest scale'
+		    , mWalkAnimSpeed(this, 'fp16', "歩きモーションスピード", 1.0f, 0.0f, 5.0f) // 'walking motion speed'
+		    , mFastTurnSpeed(this, 'fp02', "急回転速度率", 0.1f, 0.0f, 1.0f)           // 'rapid rotation speed rate'
+		    , mMaxFastTurnAngle(this, 'fp05', "急回転速度最大", 1.0f, 0.0f, 180.0f)    // 'rapid rotation speed max'
+		    , mCarrySpeed(this, 'fp03', "戻り速度", 10.0f, 0.0f, 100.0f)               // 'return speed'
+		    , mSuckDamage(this, 'fp04', "コンテナダメージ", 10.0f, 0.0f, 1000.0f)      // 'container [onyon/ship] damage'
+		    , mPressDamage(this, 'fp06', "プレスダメージ", 10.0f, 0.0f, 1000.0f)       // 'press damage'
+		    , mWaitTime(this, 'fp14', "待機時間", 20.0f, 0.0f, 500.0f)                 // 'wait time'
+		    , mHideTime(this, 'fp15', "潜伏時間", 50.0f, 0.0f, 300.0f)                 // 'incubation time'
+		    , mMaxCarryWeight(this, 'ip01', "ターゲットスロット数境界", 5, 1, 20)      // 'target slot limit'
 		{
 		}

--- a/include/Game/Entities/Pelplant.h
+++ b/include/Game/Entities/Pelplant.h
@ -281,9 +281,9 @@ struct Parms : EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mSmallToMedGrowth(this, 'fp01', "成長(小→中）", 120.0f, 0.0f, 300.0f) // growth (small to medium)
-		    , mMedToLargeGrowth(this, 'fp02', "成長(中→大）", 120.0f, 0.0f, 300.0f) // growth (medium to large)
-		    , mColorChangeTime(this, 'fp03', "カラー変更時間", 1.5f, 0.0f, 5.0f)     // color change time
+		    , mSmallToMedGrowth(this, 'fp01', "成長(小→中）", 120.0f, 0.0f, 300.0f) // growth (small to medium)
+		    , mMedToLargeGrowth(this, 'fp02', "成長(中→大）", 120.0f, 0.0f, 300.0f) // growth (medium to large)
+		    , mColorChangeTime(this, 'fp03', "カラー変更時間", 1.5f, 0.0f, 5.0f)     // color change time
 		{
 		}
 		Parm<f32> mSmallToMedGrowth; // _804, fp01
--- a/include/Game/Entities/Pom.h
+++ b/include/Game/Entities/Pom.h
@ -97,12 +97,12 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mNormalMaxSlots(this, 'ip01', "吸い込みピキ数(pom)", 5, 1, 50)           // 'sucking piki number (pom)'
-		    , mQueenMaxSlots(this, 'ip11', "吸い込みピキ数(pop)", 1, 1, 50)            // 'sucking piki number (pop)'
-		    , mQueenShotMultiplier(this, 'ip13', "吐き出し倍数(pop)", 5, 1, 50)        // 'spitting multiple (pop)'
-		    , mRemainOpenTime(this, 'fp01', "開花時間", 30.0f, 0.0f, 60.0f)            // 'flowering time'
-		    , mColorChangeTime(this, 'fp02', "色換え時間", 1.25f, 0.0f, 60.0f)         // 'color change time'
-		    , mBlackWhiteAppearanceRate(this, 'fp03', "白黒出現率", 0.15f, 0.0f, 1.0f) // 'black and white appearance rate'
+		    , mNormalMaxSlots(this, 'ip01', "吸い込みピキ数(pom)", 5, 1, 50)           // 'sucking piki number (pom)'
+		    , mQueenMaxSlots(this, 'ip11', "吸い込みピキ数(pop)", 1, 1, 50)            // 'sucking piki number (pop)'
+		    , mQueenShotMultiplier(this, 'ip13', "吐き出し倍数(pop)", 5, 1, 50)        // 'spitting multiple (pop)'
+		    , mRemainOpenTime(this, 'fp01', "開花時間", 30.0f, 0.0f, 60.0f)            // 'flowering time'
+		    , mColorChangeTime(this, 'fp02', "色換え時間", 1.25f, 0.0f, 60.0f)         // 'color change time'
+		    , mBlackWhiteAppearanceRate(this, 'fp03', "白黒出現率", 0.15f, 0.0f, 1.0f) // 'black and white appearance rate'
 		{
 		}

--- a/include/Game/Entities/Queen.h
+++ b/include/Game/Entities/Queen.h
@ -164,11 +164,11 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "QueenParms")
-		    , mRollingTime(this, 'fp01', "ローリング時間", 10.0f, 0.0f, 100.0f)   // 'rolling time'
-		    , mBirthInterval(this, 'fp02', "出産間隔 ( sec )", 0.0f, 0.0f, 10.0f) // 'birth interval ( sec )'
+		    , mRollingTime(this, 'fp01', "ローリング時間", 10.0f, 0.0f, 100.0f)   // 'rolling time'
+		    , mBirthInterval(this, 'fp02', "出産間隔 ( sec )", 0.0f, 0.0f, 10.0f) // 'birth interval ( sec )'
 		    , mHoBHealth(this, 'fp11', "Forest 1 Life", 2500.0f, 0.0f, 10000.0f)  // (Hole of Beasts Life)
-		    , mMaxBirths(this, 'ip01', "出産数 ( Max )", 50, 0, 50)               // 'number of births ( Max )'
-		    , mMinBirths(this, 'ip02', "出産数 ( Min )", 25, 0, 50)               // 'number of births ( Min )'
+		    , mMaxBirths(this, 'ip01', "出産数 ( Max )", 50, 0, 50)               // 'number of births ( Max )'
+		    , mMinBirths(this, 'ip02', "出産数 ( Min )", 25, 0, 50)               // 'number of births ( Min )'
 		{
 		}

--- a/include/Game/Entities/Qurione.h
+++ b/include/Game/Entities/Qurione.h
@ -128,11 +128,11 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mFlightHeight(this, 'fp01', "飛行高さ", 60.0f, 0.0f, 150.0f)  // 'flight height'
-		    , mPitchRate(this, 'fp02', "上下の揺れ速度", 2.5f, 0.0f, 10.0f) // 'vertical swing speed'
-		    , mPitchAmp(this, 'fp03', "上下の揺れ幅", 20.0f, 0.0f, 50.0f)   // 'vertical swing width'
-		    , mDeathRate(this, 'fp04', "死亡速度", 100.0f, 0.0f, 1000.0f)   // 'death rate'
-		    , mDeathTime(this, 'fp05', "死亡時間", 1.0f, 0.0f, 10.0f)       // 'death time'
+		    , mFlightHeight(this, 'fp01', "飛行高さ", 60.0f, 0.0f, 150.0f)  // 'flight height'
+		    , mPitchRate(this, 'fp02', "上下の揺れ速度", 2.5f, 0.0f, 10.0f) // 'vertical swing speed'
+		    , mPitchAmp(this, 'fp03', "上下の揺れ幅", 20.0f, 0.0f, 50.0f)   // 'vertical swing width'
+		    , mDeathRate(this, 'fp04', "死亡速度", 100.0f, 0.0f, 1000.0f)   // 'death rate'
+		    , mDeathTime(this, 'fp05', "死亡時間", 1.0f, 0.0f, 10.0f)       // 'death time'
 		{
 		}

--- a/include/Game/Entities/Rock.h
+++ b/include/Game/Entities/Rock.h
@ -35,9 +35,10 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mSearchRumbleSpeed(this, 'fp01', "サーチゴロゴロ速度", 150.0f, 0.0f, 1000.0f) // 'search rumble speed'
-		{
-		}
+		    , mSearchRumbleSpeed(this, 'fp01', "サーチゴロゴロ速度", 150.0f, 0.0f, 1000.0f) // 'search rumble speed'		
+			{
+				
+			}

 		Parm<f32> mSearchRumbleSpeed; // _804
 	};
--- a/include/Game/Entities/Sarai.h
+++ b/include/Game/Entities/Sarai.h
@ -86,20 +86,20 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mNormalFlightHeight(this, 'fp01', "通常飛行高さ", 100.0f, 0.0f, 300.0f)   // 'normal flight height'
-		    , mGrabFlightHeight(this, 'fp02', "掴み飛行高さ", 80.0f, 0.0f, 300.0f)      // 'grab flight height'
-		    , mStateTransitionHeight(this, 'fp03', "状態遷移高さ", 50.0f, 0.0f, 300.0f) // 'state transition height'
-		    , mNormalMovementSpeed(this, 'fp04', "通常移動速度", 100.0f, 0.0f, 300.0f)  // 'normal movement speed'
-		    , mGrabMovementSpeed(this, 'fp05', "掴み移動速度", 75.0f, 0.0f, 300.0f)     // 'grab movement speed'
-		    , mWaitTime(this, 'fp06', "ウェイト時間", 3.0f, 0.0f, 10.0f)                // 'wait time'
-		    , mClimbingFactor0(this, 'fp11', "上昇係数(0)", 1.5f, 0.0f, 5.0f)           // 'climbing factor (0)'
-		    , mClimbingFactor5(this, 'fp12', "上昇係数(5)", 1.0f, 0.0f, 5.0f)           // 'climbing factor (5)'
-		    , mPayoffProbability1(this, 'fp21', "振払確率(1)", 0.1f, 0.0f, 1.0f)        // 'payoff probability (1)'
-		    , mPayoffProbability5(this, 'fp22', "振払確率(5)", 0.7f, 0.0f, 1.0f)        // 'payoff probability (5)'
-		    , mStrugglingTime(this, 'fp23', "もがき時間", 3.0f, 0.0f, 10.0f)            // 'struggling time'
-		    , mHuntDescentFactor(this, 'fp31', "ハント下降係数", 0.3f, 0.0f, 1.0f)      // 'hunt descent factor'
-		    , mPostHuntDecayRate(this, 'fp32', "ハント後減衰率", 0.95f, 0.0f, 1.0f)     // 'post-hunt decay rate'
-		    , mFallMeckSpeed(this, 'fp41', "Fall Meck 速度", 200.0f, 0.0f, 1000.0f)     // 'Fall Meck speed'
+		    , mNormalFlightHeight(this, 'fp01', "通常飛行高さ", 100.0f, 0.0f, 300.0f)   // 'normal flight height'
+		    , mGrabFlightHeight(this, 'fp02', "掴み飛行高さ", 80.0f, 0.0f, 300.0f)      // 'grab flight height'
+		    , mStateTransitionHeight(this, 'fp03', "状態遷移高さ", 50.0f, 0.0f, 300.0f) // 'state transition height'
+		    , mNormalMovementSpeed(this, 'fp04', "通常移動速度", 100.0f, 0.0f, 300.0f)  // 'normal movement speed'
+		    , mGrabMovementSpeed(this, 'fp05', "掴み移動速度", 75.0f, 0.0f, 300.0f)     // 'grab movement speed'
+		    , mWaitTime(this, 'fp06', "ウェイト時間", 3.0f, 0.0f, 10.0f)                // 'wait time'
+		    , mClimbingFactor0(this, 'fp11', "上昇係数(0)", 1.5f, 0.0f, 5.0f)           // 'climbing factor (0)'
+		    , mClimbingFactor5(this, 'fp12', "上昇係数(5)", 1.0f, 0.0f, 5.0f)           // 'climbing factor (5)'
+		    , mPayoffProbability1(this, 'fp21', "振払確率(1)", 0.1f, 0.0f, 1.0f)        // 'payoff probability (1)'
+		    , mPayoffProbability5(this, 'fp22', "振払確率(5)", 0.7f, 0.0f, 1.0f)        // 'payoff probability (5)'
+		    , mStrugglingTime(this, 'fp23', "もがき時間", 3.0f, 0.0f, 10.0f)            // 'struggling time'
+		    , mHuntDescentFactor(this, 'fp31', "ハント下降係数", 0.3f, 0.0f, 1.0f)      // 'hunt descent factor'
+		    , mPostHuntDecayRate(this, 'fp32', "ハント後減衰率", 0.95f, 0.0f, 1.0f)     // 'post-hunt decay rate'
+		    , mFallMeckSpeed(this, 'fp41', "Fall Meck 速度", 200.0f, 0.0f, 1000.0f)     // 'Fall Meck speed'
 		{
 		}

--- a/include/Game/Entities/ShijimiChou.h
+++ b/include/Game/Entities/ShijimiChou.h
@ -216,14 +216,14 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mMaxFlyTime(this, 'fp01', "飛行期間", 300.0f, 0.0f, 1000.0f)                    // 'flight duration'
-		    , mMaxFlyTimePlant(this, 'fp08', "プランツからの飛行期間", 100.0f, 0.0f, 1000.0f) // 'flight duration from plants'
-		    , mNectarRate(this, 'fp02', "蜜レート", 1.0f, 0.0f, 1.0f)                         // 'honey rate'
-		    , mFlightHeight(this, 'fp03', "飛行高さ", 100.0f, 0.0f, 200.0f)                   // 'flight height'
-		    , mPitchRate(this, 'fp04', "飛行レート", 0.05f, 0.0f, 1.0f)                       // 'flight rate'
-		    , mPitchAmpRate(this, 'fp05', "飛行高低", 1.0f, 0.0f, 10.0f)                      // 'flight altitude'
-		    , mRedSpawnChance(this, 'fp06', "赤蝶率", 0.1f, 0.0f, 1.0f)                       // 'red butterfly rate
-		    , mPurpleSpawnChance(this, 'fp07', "黒蝶率", 0.1f, 0.0f, 1.0f)                    // 'black butterfly rate'
+		    , mMaxFlyTime(this, 'fp01', "飛行期間", 300.0f, 0.0f, 1000.0f)                    // 'flight duration'
+		    , mMaxFlyTimePlant(this, 'fp08', "プランツからの飛行期間", 100.0f, 0.0f, 1000.0f) // 'flight duration from plants'
+		    , mNectarRate(this, 'fp02', "蜜レート", 1.0f, 0.0f, 1.0f)                         // 'honey rate'
+		    , mFlightHeight(this, 'fp03', "飛行高さ", 100.0f, 0.0f, 200.0f)                   // 'flight height'
+		    , mPitchRate(this, 'fp04', "飛行レート", 0.05f, 0.0f, 1.0f)                       // 'flight rate'
+		    , mPitchAmpRate(this, 'fp05', "飛行高低", 1.0f, 0.0f, 10.0f)                      // 'flight altitude'
+		    , mRedSpawnChance(this, 'fp06', "赤蝶率", 0.1f, 0.0f, 1.0f)                       // 'red butterfly rate
+		    , mPurpleSpawnChance(this, 'fp07', "黒蝶率", 0.1f, 0.0f, 1.0f)                    // 'black butterfly rate'
 		{
 		}

--- a/include/Game/Entities/SnakeCrow.h
+++ b/include/Game/Entities/SnakeCrow.h
@ -194,10 +194,10 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mFastAppearChance(this, 'fp01', "通常出現率", 0.8f, 0.0f, 1.0f)    // 'normal appearance rate'
-		    , mWaitTime(this, 'fp11', "潜る迄の時間", 2.0f, 0.0f, 10.0f)         // 'time to dive'
-		    , mUndergroundTime(this, 'fp12', "地中での時間", 1.0f, 0.0f, 10.0f)  // 'time in the ground'
-		    , mPoisonDamage(this, 'fp21', "白ピクミン", 300.0f, 0.0f, 10000.0f)  // 'white pikmin'
+		    , mFastAppearChance(this, 'fp01', "通常出現率", 0.8f, 0.0f, 1.0f)    // 'normal appearance rate'
+		    , mWaitTime(this, 'fp11', "潜る迄の時間", 2.0f, 0.0f, 10.0f)         // 'time to dive'
+		    , mUndergroundTime(this, 'fp12', "地中での時間", 1.0f, 0.0f, 10.0f)  // 'time in the ground'
+		    , mPoisonDamage(this, 'fp21', "白ピクミン", 300.0f, 0.0f, 10000.0f)  // 'white pikmin'
 		    , mWFGHealth(this, 'fp31', "Forest 2 Life", 7500.0f, 0.0f, 99999.0f) // (White Flower Garden Life)
 		{
 		}
--- a/include/Game/Entities/SnakeWhole.h
+++ b/include/Game/Entities/SnakeWhole.h
@ -195,10 +195,10 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mFastAppearChance(this, 'fp01', "通常出現率", 0.8f, 0.0f, 1.0f)   // 'normal appearance rate'
-		    , mWaitTime(this, 'fp11', "潜る迄の時間", 2.0f, 0.0f, 10.0f)        // 'time to dive'
-		    , mUndergroundTime(this, 'fp12', "地中での時間", 1.0f, 0.0f, 10.0f) // 'time in the ground'
-		    , mPoisonDamage(this, 'fp21', "白ピクミン", 300.0f, 0.0f, 10000.0f) // 'white pikmin'
+		    , mFastAppearChance(this, 'fp01', "通常出現率", 0.8f, 0.0f, 1.0f)   // 'normal appearance rate'
+		    , mWaitTime(this, 'fp11', "潜る迄の時間", 2.0f, 0.0f, 10.0f)        // 'time to dive'
+		    , mUndergroundTime(this, 'fp12', "地中での時間", 1.0f, 0.0f, 10.0f) // 'time in the ground'
+		    , mPoisonDamage(this, 'fp21', "白ピクミン", 300.0f, 0.0f, 10000.0f) // 'white pikmin'
 		{
 		}

--- a/include/Game/Entities/Sokkuri.h
+++ b/include/Game/Entities/Sokkuri.h
@ -34,16 +34,16 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mMaxTravelTime(this, 'fp01', "ˆÚ“®ŽžŠÔ<EFBFBD>Å‘å", 1.0f, 0.0f, 10.0f)                   // 'maximum travel time'
-		    , mMinTravelTime(this, 'fp02', "ˆÚ“®ŽžŠÔ<EFBFBD>Å<EFBFBD>¬", 0.0f, 0.0f, 10.0f)                   // 'minimum travel time'
-		    , mMaxMoveAngle(this, 'fp03', "ˆÚ“®Šp“x<EFBFBD>Å‘å", 90.0f, 0.0f, 180.0f)                  // 'maximum moving angle'
-		    , mMinMoveAngle(this, 'fp04', "ˆÚ“®Šp“x<EFBFBD>Å<EFBFBD>¬", 45.0f, 0.0f, 180.0f)                  // 'minimum moving angle'
-		    , mWaitingProbability(this, 'fp11', "‘Ò‹@Šm—¦", 0.25f, 0.0f, 1.0f)                  // 'waiting probability'
-		    , mMaxWaitingTime(this, 'fp12', "‘Ò‹@ŽžŠÔ<C5A0>Å‘å", 2.0f, 0.0f, 10.0f)                  // 'maximum waiting time'
-		    , mMinWaitingTime(this, 'fp13', "‘Ò‹@ŽžŠÔ<C5A0>Å<EFBFBD>¬", 1.0f, 0.0f, 10.0f)                  // 'minimum waiting time'
-		    , mUnderwaterMoveSpeed(this, 'fp21', "<EFBFBD>…’†ˆÚ“®‘¬“x", 25.0f, 0.0f, 1000.0f)          // 'underwater movement speed'
-		    , mUnderwaterRotationRate(this, 'fp22', "<EFBFBD>…’†‰ñ“]‘¬“x—¦", 0.05f, 0.0f, 1.0f)        // 'underwater rotation rate'
-		    , mUnderwaterRotationMaxSpeed(this, 'fp23', "<EFBFBD>…’†‰ñ“]<5D>Å‘å‘¬“x", 1.0f, 0.0f, 360.0f) // 'underwater rotation maximum speed'
+		    , mMaxTravelTime(this, 'fp01', "移動時間最大", 1.0f, 0.0f, 10.0f)                   // 'maximum travel time'
+		    , mMinTravelTime(this, 'fp02', "移動時間最小", 0.0f, 0.0f, 10.0f)                   // 'minimum travel time'
+		    , mMaxMoveAngle(this, 'fp03', "移動角度最大", 90.0f, 0.0f, 180.0f)                  // 'maximum moving angle'
+		    , mMinMoveAngle(this, 'fp04', "移動角度最小", 45.0f, 0.0f, 180.0f)                  // 'minimum moving angle'
+		    , mWaitingProbability(this, 'fp11', "待機確率", 0.25f, 0.0f, 1.0f)                  // 'waiting probability'
+		    , mMaxWaitingTime(this, 'fp12', "待機時間最大", 2.0f, 0.0f, 10.0f)                  // 'maximum waiting time'
+		    , mMinWaitingTime(this, 'fp13', "待機時間最小", 1.0f, 0.0f, 10.0f)                  // 'minimum waiting time'
+		    , mUnderwaterMoveSpeed(this, 'fp21', "水中移動速度", 25.0f, 0.0f, 1000.0f)          // 'underwater movement speed'
+		    , mUnderwaterRotationRate(this, 'fp22', "水中回転速度率", 0.05f, 0.0f, 1.0f)        // 'underwater rotation rate'
+		    , mUnderwaterRotationMaxSpeed(this, 'fp23', "水中回転最大速度", 1.0f, 0.0f, 360.0f) // 'underwater rotation maximum speed'
 		{
 		}

--- a/include/Game/Entities/Tadpole.h
+++ b/include/Game/Entities/Tadpole.h
@ -84,7 +84,7 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mPitterPatterMoveSpeed(this, 'fp01', "ƒsƒ`ƒsƒ`ˆÚ“®‘¬“x", 20.0f, 0.0f,
+		    , mPitterPatterMoveSpeed(this, 'fp01', "ピチピチ移動速度", 20.0f, 0.0f,
 		                             1000.0f) // 'pichipichi movement speed'
 		{
 		}
--- a/include/Game/Entities/TamagoMushi.h
+++ b/include/Game/Entities/TamagoMushi.h
@ -26,13 +26,13 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mSurvivalTime(this, 'fp01', "生存時間", 300.0f, 0.0, 2000.0f)    // 'survival time'
-		    , mAppearanceRange(this, 'fp02', "出現範囲", 80.0f, 0.0f, 200.0f)  // 'appearance range'
-		    , mHoneyRate(this, 'fp03', "蜜レート", 1.0f, 0.0f, 1.0f)           // 'honey rate'
-		    , mMinimumWalkTime(this, 'ip01', "歩き時間最小", 60, 0, 300)       // 'minimum walking time'
-		    , mMaximumWalkTime(this, 'ip02', "歩き時間最大", 100, 0, 600)      // 'maximum walking time'
-		    , mMinimumAppearanceTime(this, 'ip03', "出現時間最小", 10, 0, 100) // 'minimum appearance time'
-		    , mMaximumAppearanceTime(this, 'ip04', "出現時間最大", 50, 0, 200) // 'maximum appearance time'
+		    , mSurvivalTime(this, 'fp01', "生存時間", 300.0f, 0.0, 2000.0f)    // 'survival time'
+		    , mAppearanceRange(this, 'fp02', "出現範囲", 80.0f, 0.0f, 200.0f)  // 'appearance range'
+		    , mHoneyRate(this, 'fp03', "蜜レート", 1.0f, 0.0f, 1.0f)           // 'honey rate'
+		    , mMinimumWalkTime(this, 'ip01', "歩き時間最小", 60, 0, 300)       // 'minimum walking time'
+		    , mMaximumWalkTime(this, 'ip02', "歩き時間最大", 100, 0, 600)      // 'maximum walking time'
+		    , mMinimumAppearanceTime(this, 'ip03', "出現時間最小", 10, 0, 100) // 'minimum appearance time'
+		    , mMaximumAppearanceTime(this, 'ip04', "出現時間最大", 50, 0, 200) // 'maximum appearance time'
 		{
 		}

--- a/include/Game/Entities/Tobi.h
+++ b/include/Game/Entities/Tobi.h
@ -128,11 +128,11 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mTakeOffHealthRatio(this, 'fp01', "離陸ライフ", 0.5f, 0.0f, 1.0f)  // 'takeoff life'
-		    , mLandHealthRatio(this, 'fp02', "着陸ライフ", 0.7f, 0.0f, 1.0f)     // 'landing life'
-		    , mFlightHeight(this, 'fp03', "飛行オフセット", 60.0f, 0.0f, 300.0f) // 'flight offset'
-		    , mPoisonDamage(this, 'fp11', "白ピクミン", 300.0f, 0.0f, 10000.0f)  // 'white pikmin'
-		    , mBridgeDamage(this, 'fp12', "橋食いパワー", 75.0f, 0.0f, 100.0f)   // 'bridge eating power'
+		    , mTakeOffHealthRatio(this, 'fp01', "離陸ライフ", 0.5f, 0.0f, 1.0f)  // 'takeoff life'
+		    , mLandHealthRatio(this, 'fp02', "着陸ライフ", 0.7f, 0.0f, 1.0f)     // 'landing life'
+		    , mFlightHeight(this, 'fp03', "飛行オフセット", 60.0f, 0.0f, 300.0f) // 'flight offset'
+		    , mPoisonDamage(this, 'fp11', "白ピクミン", 300.0f, 0.0f, 10000.0f)  // 'white pikmin'
+		    , mBridgeDamage(this, 'fp12', "橋食いパワー", 75.0f, 0.0f, 100.0f)   // 'bridge eating power'
 		{
 		}

--- a/include/Game/Entities/Tyre.h
+++ b/include/Game/Entities/Tyre.h
@ -156,7 +156,7 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mTyreRotationSpeed(this, 'fp01', "回転スピード", 0.5f, 0.0f, 100.0f) // rotation speed
+		    , mTyreRotationSpeed(this, 'fp01', "回転スピード", 0.5f, 0.0f, 100.0f) // rotation speed
 		{
 		}

--- a/include/Game/Entities/Ujia.h
+++ b/include/Game/Entities/Ujia.h
@ -112,7 +112,7 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mBridgeDamage(this, 'fp01', "橋食いパワー", 25.0f, 0.0f, 100.0f) // 'bridge eating power'
+		    , mBridgeDamage(this, 'fp01', "橋食いパワー", 25.0f, 0.0f, 100.0f) // 'bridge eating power'
 		{
 		}

--- a/include/Game/Entities/Ujib.h
+++ b/include/Game/Entities/Ujib.h
@ -118,8 +118,8 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		inline ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mPoisonDamage(this, 'fp01', "白ピクミン", 300.0f, 0.0f, 10000.0f) // 'white pikmin'
-		    , mBridgeDamage(this, 'fp02', "橋食いパワー", 50.0f, 0.0f, 100.0f)  // 'bridge eating power'
+		    , mPoisonDamage(this, 'fp01', "白ピクミン", 300.0f, 0.0f, 10000.0f) // 'white pikmin'
+		    , mBridgeDamage(this, 'fp02', "橋食いパワー", 50.0f, 0.0f, 100.0f)  // 'bridge eating power'
 		{
 		}

--- a/include/Game/Entities/UmiMushi.h
+++ b/include/Game/Entities/UmiMushi.h
@ -73,20 +73,20 @@ struct Parms : public EnemyParmsBase {
 	struct ProperParms : public Parameters {
 		ProperParms()
 		    : Parameters(nullptr, "EnemyParmsBase")
-		    , mDamageRate(this, 'fp01', "ダメージレート", 1.0f, 0.0f, 1.0f)           // 'damage rate'
-		    , mTurnStartAngle(this, 'fp02', "旋回開始角度", 60.0f, 0.0f, 180.0f)      // 'turn start angle'
-		    , mTurnEndAngle(this, 'fp03', "旋回終了角度", 10.0f, 0.0f, 180.0f)        // 'turn end angle'
-		    , mMoveSpeed(this, 'fp04', "サーチ移動速度", 10.0f, 0.0f, 100.0f)         // 'search movement speed'
-		    , mRotateSpeed(this, 'fp06', "サーチ回転速度率", 0.1f, 0.0f, 1.0f)        // 'search rotation speed rate'
-		    , mRotateSpeedMax(this, 'fp07', "サーチ回転最大速度", 5.0f, 0.0f, 360.0f) // 'search rotation max speed'
-		    , mPurpleDamageRate(this, 'fp09', "黒ピクミンダメージレート", 0.0f, 0.0f,
+		    , mDamageRate(this, 'fp01', "ダメージレート", 1.0f, 0.0f, 1.0f)           // 'damage rate'
+		    , mTurnStartAngle(this, 'fp02', "旋回開始角度", 60.0f, 0.0f, 180.0f)      // 'turn start angle'
+		    , mTurnEndAngle(this, 'fp03', "旋回終了角度", 10.0f, 0.0f, 180.0f)        // 'turn end angle'
+		    , mMoveSpeed(this, 'fp04', "サーチ移動速度", 10.0f, 0.0f, 100.0f)         // 'search movement speed'
+		    , mRotateSpeed(this, 'fp06', "サーチ回転速度率", 0.1f, 0.0f, 1.0f)        // 'search rotation speed rate'
+		    , mRotateSpeedMax(this, 'fp07', "サーチ回転最大速度", 5.0f, 0.0f, 360.0f) // 'search rotation max speed'
+		    , mPurpleDamageRate(this, 'fp09', "黒ピクミンダメージレート", 0.0f, 0.0f,
 		                        1.0f)                                              // 'black pikmin damage rate'
-		    , mCaveTerritory(this, 'fp10', "地下テリトリー", 200.0f, 0.0f, 500.0f) // 'underground territory'
-		    , mWhiteDamage(this, 'fp11', "白ピクミン", 300.0f, 0.0f, 1000.0f)      // 'white pikmin'
-		    , mBlindHealth(this, 'fp12', "めくらライフ", 1000.0f, 0.0f, 2000.0f)   // 'blind life'
-		    , mBlindWaitTime(this, 'fp13', "めくら待機間隔", 200.0f, 0.0f, 500.0f) // 'blind wait interval'
-		    , mBlindMoveTime(this, 'fp14', "めくら移動間隔", 200.0f, 0.0f, 500.0f) // 'blind movement interval'
-		    , mWaitTimeAfterAttack(this, 'ip01', "攻撃後待機期間", 100, 0, 300)    // 'waiting period after attack'
+		    , mCaveTerritory(this, 'fp10', "地下テリトリー", 200.0f, 0.0f, 500.0f) // 'underground territory'
+		    , mWhiteDamage(this, 'fp11', "白ピクミン", 300.0f, 0.0f, 1000.0f)      // 'white pikmin'
+		    , mBlindHealth(this, 'fp12', "めくらライフ", 1000.0f, 0.0f, 2000.0f)   // 'blind life'
+		    , mBlindWaitTime(this, 'fp13', "めくら待機間隔", 200.0f, 0.0f, 500.0f) // 'blind wait interval'
+		    , mBlindMoveTime(this, 'fp14', "めくら移動間隔", 200.0f, 0.0f, 500.0f) // 'blind movement interval'
+		    , mWaitTimeAfterAttack(this, 'ip01', "攻撃後待機期間", 100, 0, 300)    // 'waiting period after attack'
 		{
 		}

--- a/include/Game/FakePiki.h
+++ b/include/Game/FakePiki.h
@ -273,18 +273,18 @@ struct FakePikiParms : public CreatureParms {
 	struct Parms : public Parameters {
 		Parms()
 		    : Parameters(nullptr, "FakePiki::Parms")
-		    , mStepStartSpeed(this, 'fp01', "ASIBUMI 開始スピード", 5.0f, 0.0f, 500.0f)                 // 'ASIBUMI start speed' (stepping?)
-		    , mWalkStartSpeed(this, 'fp02', "WALK 開始スピード", 8.0f, 0.0f, 500.0f)                    // 'WALK start speed'
-		    , mRunStartSpeed(this, 'fp03', "RUN 開始スピード", 20.0f, 0.0f, 500.0f)                     // 'RUN start speed'
-		    , mEscapeStartSpeed(this, 'fp04', "ESCAPE 開始スピード", 95.0f, 0.0f, 500.0f)               // 'ESCAPE start speed'
-		    , mWalkPlaybackFrameCountMin(this, 'fp04', "WALK 再生フレーム数(min)", 60.0f, 0.0f, 300.0f) // 'WALK playback frame count (min)'
-		    , mWalkPlaybackFrameCountMax(this, 'fp05', "WALK 再生フレーム数(max)", 90.0f, 0.0f,
+		    , mStepStartSpeed(this, 'fp01', "ASIBUMI 開始スピード", 5.0f, 0.0f, 500.0f)                 // 'ASIBUMI start speed' (stepping?)
+		    , mWalkStartSpeed(this, 'fp02', "WALK 開始スピード", 8.0f, 0.0f, 500.0f)                    // 'WALK start speed'
+		    , mRunStartSpeed(this, 'fp03', "RUN 開始スピード", 20.0f, 0.0f, 500.0f)                     // 'RUN start speed'
+		    , mEscapeStartSpeed(this, 'fp04', "ESCAPE 開始スピード", 95.0f, 0.0f, 500.0f)               // 'ESCAPE start speed'
+		    , mWalkPlaybackFrameCountMin(this, 'fp04', "WALK 再生フレーム数(min)", 60.0f, 0.0f, 300.0f) // 'WALK playback frame count (min)'
+		    , mWalkPlaybackFrameCountMax(this, 'fp05', "WALK 再生フレーム数(max)", 90.0f, 0.0f,
 		                                 300.0f)                                                      // 'WALK  playback frame count (max)'
-		    , mRunPlaybackFrameCountMin(this, 'fp06', "RUN 再生フレーム数(min)", 40.0f, 0.0f, 300.0f) // 'RUN playback frame count (min)'
-		    , mRunPlaybackFrameCountMax(this, 'fp07', "RUN 再生フレーム数(max)", 60.0f, 0.0f, 300.0f) // 'RUN playback frame count (max)'
-		    , mEscapePlaybackFrameCountMin(this, 'fp08', "ESCAPE 再生フレーム数(min)", 60.0f, 0.0f,
+		    , mRunPlaybackFrameCountMin(this, 'fp06', "RUN 再生フレーム数(min)", 40.0f, 0.0f, 300.0f) // 'RUN playback frame count (min)'
+		    , mRunPlaybackFrameCountMax(this, 'fp07', "RUN 再生フレーム数(max)", 60.0f, 0.0f, 300.0f) // 'RUN playback frame count (max)'
+		    , mEscapePlaybackFrameCountMin(this, 'fp08', "ESCAPE 再生フレーム数(min)", 60.0f, 0.0f,
 		                                   300.0f) // 'ESCAPE playback frame count (min)'
-		    , mEscapePlaybackFrameCountMax(this, 'fp09', "ESCAPE 再生フレーム数(max)", 90.0f, 0.0f,
+		    , mEscapePlaybackFrameCountMax(this, 'fp09', "ESCAPE 再生フレーム数(max)", 90.0f, 0.0f,
 		                                   300.0f) // 'ESCAPE playback frame count (max)'
 		{
 		}
--- a/include/Game/GameLight.h
+++ b/include/Game/GameLight.h
@ -158,7 +158,7 @@ struct GameLightSpotSetting : public CNode {
 	struct MoveParms : public Parameters {
 		inline MoveParms()
 		    : Parameters(nullptr, "MoveParms")
-		    , mDistance(this, 'f000', "光源までの距離", 1000.0f, 0.0f, 30000.0f) // 'distance to light source'
+		    , mDistance(this, 'f000', "光源までの距離", 1000.0f, 0.0f, 30000.0f) // 'distance to light source'
 		{
 		}

@ -202,9 +202,9 @@ struct GameLightSunSetting : public CNode {
 	struct MoveParms : public Parameters {
 		inline MoveParms()
 		    : Parameters(nullptr, "MoveParms")
-		    , mDistance(this, 'f000', "光源までの距離", 20000.0f, 0.0f, 30000.0f) // 'distance to light source'
-		    , mSunriseAngle(this, 'f001', "日の出角度", 20.0f, 0.0f, 360.0f)      // 'sunrise angle'
-		    , mSunsetAngle(this, 'f002', "日の入角度", 160.0f, 0.0f, 360.0f)      // 'sunset angle'
+		    , mDistance(this, 'f000', "光源までの距離", 20000.0f, 0.0f, 30000.0f) // 'distance to light source'
+		    , mSunriseAngle(this, 'f001', "日の出角度", 20.0f, 0.0f, 360.0f)      // 'sunrise angle'
+		    , mSunsetAngle(this, 'f002', "日の入角度", 160.0f, 0.0f, 360.0f)      // 'sunset angle'
 		{
 		}

--- a/include/Game/GameLightSetting.h
+++ b/include/Game/GameLightSetting.h
@ -11,10 +11,10 @@ struct GameLightSettingBase {
 	struct Settings : public Parameters {
 		inline Settings()
 		    : Parameters(nullptr, "ColorParms")
-		    , mRed(this, 'u800', "赤", 127, 0, 255)
-		    , mGreen(this, 'u801', "緑", 127, 0, 255)
-		    , mBlue(this, 'u802', "青", 127, 0, 255)
-		    , mAlpha(this, 'u803', "アルファ", 255, 0, 255)
+		    , mRed(this, 'u800', "赤", 127, 0, 255)
+		    , mGreen(this, 'u801', "緑", 127, 0, 255)
+		    , mBlue(this, 'u802', "青", 127, 0, 255)
+		    , mAlpha(this, 'u803', "アルファ", 255, 0, 255)
 		{
 		}

@ -58,10 +58,10 @@ struct GameFogSetting {
 	struct Settings : public Parameters {
 		inline Settings()
 		    : Parameters(nullptr, "ColorParms")
-		    , mRed(this, 'u800', "赤", 127, 0, 255)
-		    , mGreen(this, 'u801', "緑", 127, 0, 255)
-		    , mBlue(this, 'u802', "青", 127, 0, 255)
-		    , mAlpha(this, 'u803', "アルファ", 255, 0, 255)
+		    , mRed(this, 'u800', "赤", 127, 0, 255)
+		    , mGreen(this, 'u801', "緑", 127, 0, 255)
+		    , mBlue(this, 'u802', "青", 127, 0, 255)
+		    , mAlpha(this, 'u803', "アルファ", 255, 0, 255)
 		{
 		}

@ -74,8 +74,8 @@ struct GameFogSetting {
 	struct GameFogParms : public Parameters {
 		inline GameFogParms()
 		    : Parameters(nullptr, "GameFogParms")
-		    , mStartZ(this, 'f000', "開始z値", 1000.0f, 0.0f, 15000.0f)
-		    , mEndZ(this, 'f001', "終了z値", 15000.0f, 0.0f, 15000.0f)
+		    , mStartZ(this, 'f000', "開始z値", 1000.0f, 0.0f, 15000.0f)
+		    , mEndZ(this, 'f001', "終了z値", 15000.0f, 0.0f, 15000.0f)
 		{
 		}

@ -124,10 +124,10 @@ struct GameShadowSetting {
 	struct Settings : public Parameters {
 		inline Settings()
 		    : Parameters(nullptr, "ColorParms")
-		    , mRed(this, 'u800', "赤", 127, 0, 255)
-		    , mGreen(this, 'u801', "緑", 127, 0, 255)
-		    , mBlue(this, 'u802', "青", 127, 0, 255)
-		    , mAlpha(this, 'u803', "アルファ", 255, 0, 255)
+		    , mRed(this, 'u800', "赤", 127, 0, 255)
+		    , mGreen(this, 'u801', "緑", 127, 0, 255)
+		    , mBlue(this, 'u802', "青", 127, 0, 255)
+		    , mAlpha(this, 'u803', "アルファ", 255, 0, 255)
 		{
 		}

@ -178,7 +178,7 @@ struct GameSpotLightSetting : public GameLightSettingBase {
 	struct SpotParms : public Parameters {
 		inline SpotParms()
 		    : Parameters(nullptr, "SpotParms")
-		    , mCutOff(this, 'f000', "カットオフ", 60.0f, 0.0f, 90.0f)
+		    , mCutOff(this, 'f000', "カットオフ", 60.0f, 0.0f, 90.0f)
 		{
 		}

--- a/include/Game/IllustratedBook.h
+++ b/include/Game/IllustratedBook.h
@ -119,17 +119,17 @@ struct CameraParms {
 	struct Parms : public Parameters {
 		Parms()
 		    : Parameters(nullptr, "cameraParms")
-		    , mRadius(this, 'f000', "半径", 350.0f, 0.0f, 2000.0f)                // 'radius'
-		    , mInitialHeight(this, 'f001', "高さ　初期値", 500.0f, 0.0f, 1000.0f) // 'height initial value'
-		    , mMinHeight(this, 'f002', "高さ　最小値", 0.0f, 0.0f, 1000.0f)       // 'height min value'
-		    , mMaxHeight(this, 'f003', "高さ　最大値", 700.0f, 0.0f, 1000.0f)     // 'height max value'
-		    , mOffsetX(this, 'f004', "オフセット　ｘ", 0.0f, -500.0f, 500.0f)     // 'offset X'
-		    , mOffsetY(this, 'f005', "オフセット　ｙ", 0.0f, -500.0f, 500.0f)     // 'offset Y'
-		    , mOffsetZ(this, 'f006', "オフセット　ｚ", 0.0f, -500.0f, 500.0f)     // 'offset Z'
-		    , mInitialViewAngle(this, 'f009', "画角　初期値", 30.0f, 0.0f, 90.0f) // 'view angle initial value'
-		    , mMinViewAngle(this, 'f007', "画角　最小値", 0.1f, 0.0f, 90.0f)      // 'view angle min value'
-		    , mMaxViewAngle(this, 'f008', "画角　最大値", 90.0f, 0.0f, 90.0f)     // 'view angle max value'
-		    , mInitialRotation(this, 'f010', "回転　初期値", 0.0f, 0.0f, 360.0f)  // 'rotation initial value'
+		    , mRadius(this, 'f000', "半径", 350.0f, 0.0f, 2000.0f)                // 'radius'
+		    , mInitialHeight(this, 'f001', "高さ　初期値", 500.0f, 0.0f, 1000.0f) // 'height initial value'
+		    , mMinHeight(this, 'f002', "高さ　最小値", 0.0f, 0.0f, 1000.0f)       // 'height min value'
+		    , mMaxHeight(this, 'f003', "高さ　最大値", 700.0f, 0.0f, 1000.0f)     // 'height max value'
+		    , mOffsetX(this, 'f004', "オフセット　ｘ", 0.0f, -500.0f, 500.0f)     // 'offset X'
+		    , mOffsetY(this, 'f005', "オフセット　ｙ", 0.0f, -500.0f, 500.0f)     // 'offset Y'
+		    , mOffsetZ(this, 'f006', "オフセット　ｚ", 0.0f, -500.0f, 500.0f)     // 'offset Z'
+		    , mInitialViewAngle(this, 'f009', "画角　初期値", 30.0f, 0.0f, 90.0f) // 'view angle initial value'
+		    , mMinViewAngle(this, 'f007', "画角　最小値", 0.1f, 0.0f, 90.0f)      // 'view angle min value'
+		    , mMaxViewAngle(this, 'f008', "画角　最大値", 90.0f, 0.0f, 90.0f)     // 'view angle max value'
+		    , mInitialRotation(this, 'f010', "回転　初期値", 0.0f, 0.0f, 360.0f)  // 'rotation initial value'
 		{
 		}

@ -205,9 +205,9 @@ struct PositionParms : public CNode {
 	struct Parms : public Parameters {
 		inline Parms()
 		    : Parameters(nullptr, "PositionParms")
-		    , mAppearPosX(this, 'f000', "出現位置　ｘ", 0.0f, -10000.0f, 10000.0f) // 'appearance position X'
-		    , mAppearPosY(this, 'f001', "出現位置　ｙ", 0.0f, -10000.0f, 10000.0f) // 'appearance position Y'
-		    , mAppearPosZ(this, 'f002', "出現位置　ｚ", 0.0f, -10000.0f, 10000.0f) // 'appearance position Z'
+		    , mAppearPosX(this, 'f000', "出現位置　ｘ", 0.0f, -10000.0f, 10000.0f) // 'appearance position X'
+		    , mAppearPosY(this, 'f001', "出現位置　ｙ", 0.0f, -10000.0f, 10000.0f) // 'appearance position Y'
+		    , mAppearPosZ(this, 'f002', "出現位置　ｚ", 0.0f, -10000.0f, 10000.0f) // 'appearance position Z'
 		{
 		}

@ -242,9 +242,9 @@ struct EnemyParms : public CNode {
 	struct Parms : public Parameters {
 		inline Parms()
 		    : Parameters(nullptr, "enemyParms")
-		    , mSize(this, 'f001', "大きさ", 10.0f, 0.0f, 1000.0f)         // 'size'
-		    , mAppearRange(this, 'f000', "出現範囲", 0.0f, 0.0f, 1000.0f) // 'occurence range'
-		    , mAppearNum(this, 'i000', "出現数", 1, 1, 99)
+		    , mSize(this, 'f001', "大きさ", 10.0f, 0.0f, 1000.0f)         // 'size'
+		    , mAppearRange(this, 'f000', "出現範囲", 0.0f, 0.0f, 1000.0f) // 'occurence range'
+		    , mAppearNum(this, 'i000', "出現数", 1, 1, 99)
 		{
 		}

@ -281,9 +281,9 @@ struct ItemParms : public CNode {
 	struct Parms : public Parameters {
 		inline Parms()
 		    : Parameters(nullptr, "enemyParms")
-		    , mOffsetX(this, 'f000', "オフセットｘ", 0.0f, -10000.0f, 10000.0f)
-		    , mOffsetY(this, 'f001', "オフセットｙ", 0.0f, -10000.0f, 10000.0f)
-		    , mOffsetZ(this, 'f002', "オフセットｚ", 0.0f, -10000.0f, 10000.0f)
+		    , mOffsetX(this, 'f000', "オフセットｘ", 0.0f, -10000.0f, 10000.0f)
+		    , mOffsetY(this, 'f001', "オフセットｙ", 0.0f, -10000.0f, 10000.0f)
+		    , mOffsetZ(this, 'f002', "オフセットｚ", 0.0f, -10000.0f, 10000.0f)
 		{
 		}

--- a/include/Game/NaviParms.h
+++ b/include/Game/NaviParms.h
@ -8,70 +8,70 @@ struct NaviParms : public FakePikiParms {
 	struct Parms : public Parameters {
 		Parms()
 		    : Parameters(nullptr, "Navi::Parms")
-		    , mActionRadius(this, 'p000', "アクション半径", 25.0f, 0.0f, 500.0f)                 // 'action radius'
-		    , mAutopluckDistance(this, 'p060', "連続抜き距離", 200.0f, 0.0f, 1000.0f)            // 'continuous pluck distance'
-		    , mPluckDistanceOutsideOnyon(this, 'p062', "抜き距離(onyon外)", 15.0f, 0.0f, 500.0f) // 'pluck distance (outside onyon)'
-		    , mPikiCallMaxRadius(this, 'p001', "ピキ呼び最大半径", 90.0f, 0.0f, 500.0f)          // 'piki call max radius'
-		    , mPikiCallMinRadius(this, 'p053', "ピキ呼び最小半径", 5.0f, 0.0f, 500.0f)           // 'piki call min radius'
-		    , mMaxCallTime(this, 'p002', "ピキ呼び最大時間", 0.45f, 0.0f, 500.0f)                // 'max call time'
-		    , mCircleDisappearTime(this, 'p003', "サークル消え時間", 1.0f, 0.0f, 500.0f)         // 'circle disappearing time'
-		    , mMoveSpeed(this, 'p004', "移動速度", 160.0f, 0.0f, 500.0f)                         // 'movement speed'
-		    , mRunSpeed(this, 'p056', "走る速さ（好調時）", 160.0f, 0.0f, 500.0f) // 'running speed (in good condition)' (lol)
-		    , mDisplayScale(this, 'p038', "表\示スケール", 1.2f, 0.1f, 10.0f)     // 'display scale'
+		    , mActionRadius(this, 'p000', "アクション半径", 25.0f, 0.0f, 500.0f)                 // 'action radius'
+		    , mAutopluckDistance(this, 'p060', "連続抜き距離", 200.0f, 0.0f, 1000.0f)            // 'continuous pluck distance'
+		    , mPluckDistanceOutsideOnyon(this, 'p062', "抜き距離(onyon外)", 15.0f, 0.0f, 500.0f) // 'pluck distance (outside onyon)'
+		    , mPikiCallMaxRadius(this, 'p001', "ピキ呼び最大半径", 90.0f, 0.0f, 500.0f)          // 'piki call max radius'
+		    , mPikiCallMinRadius(this, 'p053', "ピキ呼び最小半径", 5.0f, 0.0f, 500.0f)           // 'piki call min radius'
+		    , mMaxCallTime(this, 'p002', "ピキ呼び最大時間", 0.45f, 0.0f, 500.0f)                // 'max call time'
+		    , mCircleDisappearTime(this, 'p003', "サークル消え時間", 1.0f, 0.0f, 500.0f)         // 'circle disappearing time'
+		    , mMoveSpeed(this, 'p004', "移動速度", 160.0f, 0.0f, 500.0f)                         // 'movement speed'
+		    , mRunSpeed(this, 'p056', "走る速さ（好調時）", 160.0f, 0.0f, 500.0f) // 'running speed (in good condition)' (lol)
+		    , mDisplayScale(this, 'p038', "表\示スケール", 1.2f, 0.1f, 10.0f)     // 'display scale'
 		    , mStick0(this, 'p005', "Stick 0", 0.001f, 0.0f, 1.0f)
 		    , mStick01(this, 'p020', "Stick 01", 0.1f, 0.0f, 1.0f)
 		    , mStick1(this, 'p006', "Stick 1", 0.8f, 0.0f, 1.0f)
 		    , mStick2(this, 'p007', "Stick 2", 1.0f, 0.0f, 1.0f)
-		    , mSlidingAngle(this, 'p008', "すべり角度", 120.0f, 90.0f, 180.0f)           // 'sliding angle'
-		    , mTimeLimitForThrowing(this, 'p009', "投げため限界時間", 2.5f, 0.0f, 10.0f) // 'time limit for throwing'
-		    , mThrowDistanceMax(this, 'p010', "投げ距離(Max)", 140.0f, 0.0f, 1000.0f)    // 'throw distance (Max)'
-		    , mThrowDistanceMin(this, 'p011', "投げ距離(Min)", 140.0f, 0.0f, 500.0f)     // 'throw distance (Min)'
-		    , mThrowHeightMax(this, 'p024', "投げ高さ(Max)", 75.0f, 0.0f, 1000.0f)       // 'throw height (Max)'
-		    , mThrowHeightMin(this, 'p025', "投げ高さ(min)", 75.0f, 0.0f, 1000.0f)       // 'throw height (min)'
-		    , mThrowHeightYellow(this, 'p054', "投げ高さ(黄色)", 115.0f, 0.0f, 1000.0f)  // 'throw height (yellow)'
-		    , mThrowBlackHeight(this, 'q000', "黒　投げ高さ", 30.0f, 0.0f, 150.0f)       // 'black throw height'
-		    , mThrowWhiteHeight(this, 'q001', "白　投げ高さ", 75.0f, 0.0f, 150.0f)       // 'white throw height'
-		    , mLandingTime(this, 'p026', "着地時間", 1.0f, 0.0f, 100.0f)                 // 'landing time'
-		    , mGrabPikiRange(this, 'p037', "ピキをつかむ有効範囲", 15.0f, 0.0f, 200.0f)  // 'effective range to grab piki'
-		    , mLoopCountToPluck(this, 'p042', "抜くループ回数", 0, 0, 10)                // 'number of loops to pluck' (?)
-		    , mPikiWaitRange(this, 'p039', "ピキが待つ範囲", 15.0f, 0.0f, 200.0f)        // 'piki wait range'
-		    , mPikiChangeFormationRange(this, 'p040', "ピキがフォーメーションを変える範囲", 40.0f, 0.0f,
+		    , mSlidingAngle(this, 'p008', "すべり角度", 120.0f, 90.0f, 180.0f)           // 'sliding angle'
+		    , mTimeLimitForThrowing(this, 'p009', "投げため限界時間", 2.5f, 0.0f, 10.0f) // 'time limit for throwing'
+		    , mThrowDistanceMax(this, 'p010', "投げ距離(Max)", 140.0f, 0.0f, 1000.0f)    // 'throw distance (Max)'
+		    , mThrowDistanceMin(this, 'p011', "投げ距離(Min)", 140.0f, 0.0f, 500.0f)     // 'throw distance (Min)'
+		    , mThrowHeightMax(this, 'p024', "投げ高さ(Max)", 75.0f, 0.0f, 1000.0f)       // 'throw height (Max)'
+		    , mThrowHeightMin(this, 'p025', "投げ高さ(min)", 75.0f, 0.0f, 1000.0f)       // 'throw height (min)'
+		    , mThrowHeightYellow(this, 'p054', "投げ高さ(黄色)", 115.0f, 0.0f, 1000.0f)  // 'throw height (yellow)'
+		    , mThrowBlackHeight(this, 'q000', "黒　投げ高さ", 30.0f, 0.0f, 150.0f)       // 'black throw height'
+		    , mThrowWhiteHeight(this, 'q001', "白　投げ高さ", 75.0f, 0.0f, 150.0f)       // 'white throw height'
+		    , mLandingTime(this, 'p026', "着地時間", 1.0f, 0.0f, 100.0f)                 // 'landing time'
+		    , mGrabPikiRange(this, 'p037', "ピキをつかむ有効範囲", 15.0f, 0.0f, 200.0f)  // 'effective range to grab piki'
+		    , mLoopCountToPluck(this, 'p042', "抜くループ回数", 0, 0, 10)                // 'number of loops to pluck' (?)
+		    , mPikiWaitRange(this, 'p039', "ピキが待つ範囲", 15.0f, 0.0f, 200.0f)        // 'piki wait range'
+		    , mPikiChangeFormationRange(this, 'p040', "ピキがフォーメーションを変える範囲", 40.0f, 0.0f,
 		                                200.0f)                                                  // 'range where piki changes formation'
-		    , mHitSize(this, 'p021', "当たりサイズ", 8.0f, 0.0f, 100.0f)                         // 'hit size'
-		    , mGroundSize(this, 'p041', "地面当たりサイズ", 8.5f, 0.0f, 100.0f)                  // 'ground size'
-		    , mInverseWeight(this, 'p022', "重さの逆数", 1.0f, 0.0f, 2000.0f)                    // 'inverse weight'
-		    , mAimRotationSpeed(this, 'p023', "エイミング回転スピード", 0.03f, 0.0f, 1.0f)       // 'aiming rotation speed'
-		    , mTotalCrushTime(this, 'p031', "つぶれ総時間", 2.0f, 0.0f, 10.0f)                   // 'total crush time'
-		    , mFlatTime(this, 'p032', "ぺったんこ時間", 1.0f, 0.0f, 10.0f)                       // 'flat time'
-		    , mPressStartTime(this, 'p033', "押し開始時間", 0.8f, 0.0f, 10.0f)                   // 'press start time'
-		    , mPressStartStickAmount(this, 'p034', "押し開始スティック量", 0.3f, 0.0f, 1.0f)     // 'press start stick amount'
-		    , mShakePreventionAngle(this, 'p035', "手ぶれ防止角度", 10.0f, 0.0f, 180.0f)         // 'shake prevention angle'
-		    , mShakePreventionMagnitude(this, 'p036', "手ぶれ防止大きさ", 0.1f, 0.0f, 1.0f)      // 'shake prevention magnitude'
-		    , mCursorLookTime(this, 'p048', "カーソ\ルみる時間", 0.85f, 0.0f, 60.0f)             // 'cursor look time'
-		    , mPikiLoseNumbnessTime(this, 'p049', "ピキがしびれを切らす時間", 5.0f, 0.0f, 60.0f) // 'time for piki to lose its numbness' (?)
-		    , mNeutralStickThreshold(this, 'p043', "ニュートラルスティック", 0.1f, 0.0f, 1.0f)   // 'neutral stick'
-		    , mCursorMovementStick(this, 'p044', "カーソ\ル移動スティック", 0.65f, 0.0f, 1.0f)   // 'cursor movement stick'
-		    , mClampStick(this, 'p048', "クランプスティック", 0.85f, 0.0f, 1.0f)                 // 'clamp stick'
-		    , mMinCursorMovementRadius(this, 'p045', "カーソ\ル移動最小半径", 0.0f, 0.0f, 1000.0f) // 'min cursor movement radius'
-		    , mMaxCursorMoveRadius(this, 'p046', "カーソ\ル移動最大半径", 100.0f, 0.0f, 2000.0f)   // 'max cursor movement radius'
-		    , mCursorMovementSpeed(this, 'p047', "カーソ\ル移動スピード", 300.0f, 0.0f, 1000.0f)   // 'cursor movement speed'
-		    , mMaxHealth(this, 'p050', "ライフ", 100.0f, 0.0f, 1000.0f)                            // 'life'
-		    , mAttackPower(this, 'p051', "攻撃力", 10.0f, 0.0f, 1000.0f)                           // 'attack power'
-		    , mAttackRange(this, 'p052', "攻撃範囲", 10.0f, 0.0f, 100.0f)                          // 'attack range'
-		    , mCursorCount(this, 'p055', "カーソ\ルカウント", 1, 0, 10)                            // 'cursor count'
+		    , mHitSize(this, 'p021', "当たりサイズ", 8.0f, 0.0f, 100.0f)                         // 'hit size'
+		    , mGroundSize(this, 'p041', "地面当たりサイズ", 8.5f, 0.0f, 100.0f)                  // 'ground size'
+		    , mInverseWeight(this, 'p022', "重さの逆数", 1.0f, 0.0f, 2000.0f)                    // 'inverse weight'
+		    , mAimRotationSpeed(this, 'p023', "エイミング回転スピード", 0.03f, 0.0f, 1.0f)       // 'aiming rotation speed'
+		    , mTotalCrushTime(this, 'p031', "つぶれ総時間", 2.0f, 0.0f, 10.0f)                   // 'total crush time'
+		    , mFlatTime(this, 'p032', "ぺったんこ時間", 1.0f, 0.0f, 10.0f)                       // 'flat time'
+		    , mPressStartTime(this, 'p033', "押し開始時間", 0.8f, 0.0f, 10.0f)                   // 'press start time'
+		    , mPressStartStickAmount(this, 'p034', "押し開始スティック量", 0.3f, 0.0f, 1.0f)     // 'press start stick amount'
+		    , mShakePreventionAngle(this, 'p035', "手ぶれ防止角度", 10.0f, 0.0f, 180.0f)         // 'shake prevention angle'
+		    , mShakePreventionMagnitude(this, 'p036', "手ぶれ防止大きさ", 0.1f, 0.0f, 1.0f)      // 'shake prevention magnitude'
+		    , mCursorLookTime(this, 'p048', "カーソ\ルみる時間", 0.85f, 0.0f, 60.0f)             // 'cursor look time'
+		    , mPikiLoseNumbnessTime(this, 'p049', "ピキがしびれを切らす時間", 5.0f, 0.0f, 60.0f) // 'time for piki to lose its numbness' (?)
+		    , mNeutralStickThreshold(this, 'p043', "ニュートラルスティック", 0.1f, 0.0f, 1.0f)   // 'neutral stick'
+		    , mCursorMovementStick(this, 'p044', "カーソ\ル移動スティック", 0.65f, 0.0f, 1.0f)   // 'cursor movement stick'
+		    , mClampStick(this, 'p048', "クランプスティック", 0.85f, 0.0f, 1.0f)                 // 'clamp stick'
+		    , mMinCursorMovementRadius(this, 'p045', "カーソ\ル移動最小半径", 0.0f, 0.0f, 1000.0f) // 'min cursor movement radius'
+		    , mMaxCursorMoveRadius(this, 'p046', "カーソ\ル移動最大半径", 100.0f, 0.0f, 2000.0f)   // 'max cursor movement radius'
+		    , mCursorMovementSpeed(this, 'p047', "カーソ\ル移動スピード", 300.0f, 0.0f, 1000.0f)   // 'cursor movement speed'
+		    , mMaxHealth(this, 'p050', "ライフ", 100.0f, 0.0f, 1000.0f)                            // 'life'
+		    , mAttackPower(this, 'p051', "攻撃力", 10.0f, 0.0f, 1000.0f)                           // 'attack power'
+		    , mAttackRange(this, 'p052', "攻撃範囲", 10.0f, 0.0f, 100.0f)                          // 'attack range'
+		    , mCursorCount(this, 'p055', "カーソ\ルカウント", 1, 0, 10)                            // 'cursor count'
 		    , mMushroomFlickCount(this, 'p057', "kinoko Flick Count", 3, 0, 16)                    // 'mushroom flick count' (?)
 		    , mBuryKeyCount(this, 'p058', "bury Key Count", 2, 0, 16)
 		    , mBuryExitCount(this, 'p059', "bury Exit Count", 2, 0, 16)
-		    , mCloseCameraZoomOut(this, 'p061', "寄りカメラズームアウト(frame)", 80, 0, 1000)      // 'close camera zoom out (frame)'
-		    , mFormationLvl0(this, 'q002', "隊列 MAX Lv0", 10, 1, 100)                             // 'formation MAX Lv0'
-		    , mFormationLvl1(this, 'q003', "隊列 MAX Lv1", 25, 1, 100)                             // 'formation MAX Lv1'
-		    , mFormationMaxLvl2(this, 'q004', "隊列 MAX Lv2", 50, 1, 100)                          // 'formation MAX Lv2'
-		    , mFormationMaxLvl3(this, 'q005', "隊列 MAX Lv3", 100, 1, 100)                         // 'formation MAX Lv3'
-		    , mRushBootSpeed(this, 'q006', "ダッシュブーツ速度", 240.0f, 0.0f, 500.0f)             // 'rush boot speed'
-		    , mWideWhistleRadius(this, 'q007', "広範囲の笛半径", 200.0f, 0.0f, 300.0f)             // 'wide whistle radius'
-		    , mShieldDamageReductionRate(this, 'q008', "シールドダメージ軽減率", 0.5f, 0.0f, 1.0f) // 'shield damage reduction rate'
-		    , mSeesawWeight(this, 'q009', "シーソ\ーで使う重さ", 2, 0, 10)                         // 'weight for seesaw'
-		    , mElectricGateDamage(this, 'q010', "電気ゲートダメージ", 10.0f, 0.0f, 200.0f)         // 'electric gate damage'
+		    , mCloseCameraZoomOut(this, 'p061', "寄りカメラズームアウト(frame)", 80, 0, 1000)      // 'close camera zoom out (frame)'
+		    , mFormationLvl0(this, 'q002', "隊列 MAX Lv0", 10, 1, 100)                             // 'formation MAX Lv0'
+		    , mFormationLvl1(this, 'q003', "隊列 MAX Lv1", 25, 1, 100)                             // 'formation MAX Lv1'
+		    , mFormationMaxLvl2(this, 'q004', "隊列 MAX Lv2", 50, 1, 100)                          // 'formation MAX Lv2'
+		    , mFormationMaxLvl3(this, 'q005', "隊列 MAX Lv3", 100, 1, 100)                         // 'formation MAX Lv3'
+		    , mRushBootSpeed(this, 'q006', "ダッシュブーツ速度", 240.0f, 0.0f, 500.0f)             // 'rush boot speed'
+		    , mWideWhistleRadius(this, 'q007', "広範囲の笛半径", 200.0f, 0.0f, 300.0f)             // 'wide whistle radius'
+		    , mShieldDamageReductionRate(this, 'q008', "シールドダメージ軽減率", 0.5f, 0.0f, 1.0f) // 'shield damage reduction rate'
+		    , mSeesawWeight(this, 'q009', "シーソ\ーで使う重さ", 2, 0, 10)                         // 'weight for seesaw'
+		    , mElectricGateDamage(this, 'q010', "電気ゲートダメージ", 10.0f, 0.0f, 200.0f)         // 'electric gate damage'
 		{
 		}

--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`90d328bf8f190c90472e8c19e7e53c6ad0fe0d1a build/GPVE01/main.dol`
				`@ -0,0 +1 @@`
				`3730939092688902af4866be66d4a8404ae752c7 build/GPVE01_D17/main.dol`