Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6

2024-09-19 12:27:36 -04:00
parent e4e90eacd6 473e0623ba
commit a551efea43
53 changed files with 905 additions and 2709 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -4,5 +4,5 @@
 <!--- Describe your changes in detail -->

 ## **Discord contact info**
-<!--- formatted as name#numbers, e.g. PikalaxALT#5823 -->
-<!--- Contributors must join https://discord.gg/d5dubZ3 -->
+<!--- Formatted as username (e.g. pikalaxalt) or username#numbers (e.g. PikalaxALT#5823) -->
+<!--- Contributors must join https://discord.gg/d5dubZ3 -->
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -24,7 +24,7 @@ Unscientific benchmarks suggest **msys2 is 2x slower** than WSL1, and **Cygwin i

 All of the Windows instructions assume that the default drive is C:\\. If this differs to your actual drive letter, then replace C with the correct drive letter when reading the instructions.

-**A note of caution**: As Windows 7 is officially unsupported by Microsoft and Windows 8 has very little usage, some maintainers are unwilling to maintain the Windows 7/8 instructions. Thus, these instructions may break in the future with fixes taking longer than fixes to the Windows 10 instructions.
+**A note of caution**: As Windows 7 and Windows 8 are officially unsupported by Microsoft, some maintainers are unwilling to maintain the Windows 7/8 instructions. Thus, these instructions may break in the future with fixes taking longer than fixes to the Windows 10/11 instructions.

 ## Windows 10/11 (WSL1)
 WSL1 is the preferred terminal to build **pokeemerald**. The following instructions will explain how to install WSL1 (referred to interchangeably as WSL).
--- a/441
+++ b/441
@@ -1,49 +1,53 @@
-TOOLCHAIN := $(DEVKITARM)
-COMPARE ?= 0
+# GBA rom header
+TITLE       := POKEMON EMER
+GAME_CODE   := BPEE
+MAKER_CODE  := 01
+REVISION    := 0
+MODERN      ?= 0
+KEEP_TEMPS  ?= 0

+# `File name`.gba ('_modern' will be appended to the modern builds)
+FILE_NAME := pokeemerald
+BUILD_DIR := build
+
+# Builds the ROM using a modern compiler
+MODERN      ?= 0
+# Compares the ROM to a checksum of the original - only makes sense using when non-modern
+COMPARE     ?= 0
+
+ifeq (modern,$(MAKECMDGOALS))
+  MODERN := 1
+endif
 ifeq (compare,$(MAKECMDGOALS))
  COMPARE := 1
 endif

+# Default make rule
+all: rom
+
+# Toolchain selection
+TOOLCHAIN := $(DEVKITARM)
 # don't use dkP's base_tools anymore
 # because the redefinition of $(CC) conflicts
 # with when we want to use $(CC) to preprocess files
 # thus, manually create the variables for the bin
 # files, or use arm-none-eabi binaries on the system
 # if dkP is not installed on this system
-
 ifneq (,$(TOOLCHAIN))
-ifneq ($(wildcard $(TOOLCHAIN)/bin),)
-export PATH := $(TOOLCHAIN)/bin:$(PATH)
-endif
+  ifneq ($(wildcard $(TOOLCHAIN)/bin),)
+    export PATH := $(TOOLCHAIN)/bin:$(PATH)
+  endif
 endif

 PREFIX := arm-none-eabi-
 OBJCOPY := $(PREFIX)objcopy
 OBJDUMP := $(PREFIX)objdump
 AS := $(PREFIX)as
-
 LD := $(PREFIX)ld

-# note: the makefile must be set up so MODERNCC is never called
-# if MODERN=0
-MODERNCC := $(PREFIX)gcc
-PATH_MODERNCC := PATH="$(PATH)" $(MODERNCC)
-
-ifeq ($(OS),Windows_NT)
-EXE := .exe
-else
 EXE :=
-endif
-
-TITLE       := POKEMON EMER
-GAME_CODE   := BPEE
-MAKER_CODE  := 01
-REVISION    := 0
-MODERN      ?= 0
-
-ifeq (modern,$(MAKECMDGOALS))
-  MODERN := 1
+ifeq ($(OS),Windows_NT)
+  EXE := .exe
 endif

 # use arm-none-eabi-cpp for macOS
@@ -63,79 +67,89 @@ else
  CPP := $(PREFIX)cpp
 endif

-ROM_NAME := pokeemerald.gba
+ROM_NAME := $(FILE_NAME).gba
+OBJ_DIR_NAME := $(BUILD_DIR)/emerald
+MODERN_ROM_NAME := $(FILE_NAME)_modern.gba
+MODERN_OBJ_DIR_NAME := $(BUILD_DIR)/modern
+
 ELF_NAME := $(ROM_NAME:.gba=.elf)
 MAP_NAME := $(ROM_NAME:.gba=.map)
-OBJ_DIR_NAME := build/emerald
-
-MODERN_ROM_NAME := pokeemerald_modern.gba
 MODERN_ELF_NAME := $(MODERN_ROM_NAME:.gba=.elf)
 MODERN_MAP_NAME := $(MODERN_ROM_NAME:.gba=.map)
-MODERN_OBJ_DIR_NAME := build/modern

-SHELL := bash -o pipefail
-
-ELF = $(ROM:.gba=.elf)
-MAP = $(ROM:.gba=.map)
-SYM = $(ROM:.gba=.sym)
+# Pick our active variables
+ifeq ($(MODERN),0)
+  ROM := $(ROM_NAME)
+  OBJ_DIR := $(OBJ_DIR_NAME)
+else
+  ROM := $(MODERN_ROM_NAME)
+  OBJ_DIR := $(MODERN_OBJ_DIR_NAME)
+endif
+ELF := $(ROM:.gba=.elf)
+MAP := $(ROM:.gba=.map)
+SYM := $(ROM:.gba=.sym)

+# Commonly used directories
 C_SUBDIR = src
-GFLIB_SUBDIR = gflib
 ASM_SUBDIR = asm
 DATA_SRC_SUBDIR = src/data
 DATA_ASM_SUBDIR = data
 SONG_SUBDIR = sound/songs
 MID_SUBDIR = sound/songs/midi
-SAMPLE_SUBDIR = sound/direct_sound_samples
-CRY_SUBDIR = sound/direct_sound_samples/cries

 C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
-GFLIB_BUILDDIR = $(OBJ_DIR)/$(GFLIB_SUBDIR)
 ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
 DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
 SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
 MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR)

+SHELL := bash -o pipefail
+
+# Set flags for tools
 ASFLAGS := -mcpu=arm7tdmi --defsym MODERN=$(MODERN)

+INCLUDE_DIRS := include
+INCLUDE_CPP_ARGS := $(INCLUDE_DIRS:%=-iquote %)
+INCLUDE_SCANINC_ARGS := $(INCLUDE_DIRS:%=-I %)
+
+O_LEVEL ?= 2
+CPPFLAGS := $(INCLUDE_CPP_ARGS) -Wno-trigraphs -DMODERN=$(MODERN)
 ifeq ($(MODERN),0)
-CC1             := tools/agbcc/bin/agbcc$(EXE)
-override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm -g
-ROM := $(ROM_NAME)
-OBJ_DIR := $(OBJ_DIR_NAME)
-LIBPATH := -L ../../tools/agbcc/lib
-LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
+  CPPFLAGS += -I tools/agbcc/include -I tools/agbcc -nostdinc -undef
+  CC1 := tools/agbcc/bin/agbcc$(EXE)
+  override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O$(O_LEVEL) -fhex-asm -g
+  LIBPATH := -L ../../tools/agbcc/lib
+  LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
 else
-CC1              = $(shell $(PATH_MODERNCC) --print-prog-name=cc1) -quiet
-override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
-ROM := $(MODERN_ROM_NAME)
-OBJ_DIR := $(MODERN_OBJ_DIR_NAME)
-LIBPATH := -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libc.a))"
-LIB := $(LIBPATH) -lc -lnosys -lgcc -L../../libagbsyscall -lagbsyscall
+  # Note: The makefile must be set up to not call these if modern == 0
+  MODERNCC := $(PREFIX)gcc
+  PATH_MODERNCC := PATH="$(PATH)" $(MODERNCC)
+  CC1 := $(shell $(PATH_MODERNCC) --print-prog-name=cc1) -quiet
+  override CFLAGS += -mthumb -mthumb-interwork -O$(O_LEVEL) -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
+  LIBPATH := -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libc.a))"
+  LIB := $(LIBPATH) -lc -lnosys -lgcc -L../../libagbsyscall -lagbsyscall
+endif
+# Enable debug info if set
+ifeq ($(DINFO),1)
+  override CFLAGS += -g
 endif

-CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN)
-ifneq ($(MODERN),1)
-CPPFLAGS += -I tools/agbcc/include -I tools/agbcc -nostdinc -undef
-endif
-
-SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
-GFX := tools/gbagfx/gbagfx$(EXE)
-AIF := tools/aif2pcm/aif2pcm$(EXE)
-MID := tools/mid2agb/mid2agb$(EXE)
-SCANINC := tools/scaninc/scaninc$(EXE)
-PREPROC := tools/preproc/preproc$(EXE)
-RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE)
-FIX := tools/gbafix/gbafix$(EXE)
-MAPJSON := tools/mapjson/mapjson$(EXE)
-JSONPROC := tools/jsonproc/jsonproc$(EXE)
+# Variable filled out in other make files
+AUTO_GEN_TARGETS :=
+include make_tools.mk
+# Tool executables
+GFX       := $(TOOLS_DIR)/gbagfx/gbagfx$(EXE)
+AIF       := $(TOOLS_DIR)/aif2pcm/aif2pcm$(EXE)
+MID       := $(TOOLS_DIR)/mid2agb/mid2agb$(EXE)
+SCANINC   := $(TOOLS_DIR)/scaninc/scaninc$(EXE)
+PREPROC   := $(TOOLS_DIR)/preproc/preproc$(EXE)
+RAMSCRGEN := $(TOOLS_DIR)/ramscrgen/ramscrgen$(EXE)
+FIX       := $(TOOLS_DIR)/gbafix/gbafix$(EXE)
+MAPJSON   := $(TOOLS_DIR)/mapjson/mapjson$(EXE)
+JSONPROC  := $(TOOLS_DIR)/jsonproc/jsonproc$(EXE)

 PERL := perl
-
-# Inclusive list. If you don't want a tool to be built, don't add it here.
-TOOLDIRS := tools/aif2pcm tools/bin2c tools/gbafix tools/gbagfx tools/jsonproc tools/mapjson tools/mid2agb tools/preproc tools/ramscrgen tools/rsfont tools/scaninc
-TOOLBASE = $(TOOLDIRS:tools/%=%)
-TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE))
+SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c

 MAKEFLAGS += --no-print-directory

@@ -146,45 +160,38 @@ MAKEFLAGS += --no-print-directory
 # Delete files that weren't built properly
 .DELETE_ON_ERROR:

-# Secondary expansion is required for dependency variables in object rules.
-.SECONDEXPANSION:
-
-.PHONY: all rom clean compare tidy tools mostlyclean clean-tools $(TOOLDIRS) libagbsyscall modern tidymodern tidynonmodern
+RULES_NO_SCAN += libagbsyscall clean clean-assets tidy tidymodern tidynonmodern generated clean-generated
+.PHONY: all rom modern compare
+.PHONY: $(RULES_NO_SCAN)

 infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))

-# Build tools when building the rom
-# Disable dependency scanning for clean/tidy/tools
-# Use a separate minimal makefile for speed
-# Since we don't need to reload most of this makefile
-ifeq (,$(filter-out all rom compare modern libagbsyscall syms,$(MAKECMDGOALS)))
-$(call infoshell, $(MAKE) -f make_tools.mk)
-else
-NODEP ?= 1
-endif
-
-# check if we need to scan dependencies based on the rule
-ifeq (,$(MAKECMDGOALS))
-  SCAN_DEPS ?= 1
-else
-  # clean, tidy, tools, mostlyclean, clean-tools, $(TOOLDIRS), tidymodern, tidynonmodern don't even build the ROM
-  # libagbsyscall does its own thing
-  ifeq (,$(filter-out clean tidy tools mostlyclean clean-tools $(TOOLDIRS) tidymodern tidynonmodern libagbsyscall,$(MAKECMDGOALS)))
-    SCAN_DEPS ?= 0
-  else
-    SCAN_DEPS ?= 1
+# Check if we need to scan dependencies based on the chosen rule OR user preference
+NODEP ?= 0
+# Check if we need to pre-build tools and generate assets based on the chosen rule.
+SETUP_PREREQS ?= 1
+# Disable dependency scanning for rules that don't need it.
+ifneq (,$(MAKECMDGOALS))
+  ifeq (,$(filter-out $(RULES_NO_SCAN),$(MAKECMDGOALS)))
+    NODEP := 1
+    SETUP_PREREQS := 0
  endif
 endif

-ifeq ($(SCAN_DEPS),1)
+ifeq ($(SETUP_PREREQS),1)
+  # If set on: Default target or a rule requiring a scan
+  # Forcibly execute `make tools` since we need them for what we are doing.
+  $(call infoshell, $(MAKE) -f make_tools.mk)
+  # Oh and also generate mapjson sources before we use `SCANINC`.
+  $(call infoshell, $(MAKE) generated)
+endif
+
+# Collect sources
 C_SRCS_IN := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
 C_SRCS := $(foreach src,$(C_SRCS_IN),$(if $(findstring .inc.c,$(src)),,$(src)))
 C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))

-GFLIB_SRCS := $(wildcard $(GFLIB_SUBDIR)/*.c)
-GFLIB_OBJS := $(patsubst $(GFLIB_SUBDIR)/%.c,$(GFLIB_BUILDDIR)/%.o,$(GFLIB_SRCS))
-
-C_ASM_SRCS += $(wildcard $(C_SUBDIR)/*.s $(C_SUBDIR)/*/*.s $(C_SUBDIR)/*/*/*.s)
+C_ASM_SRCS := $(wildcard $(C_SUBDIR)/*.s $(C_SUBDIR)/*/*.s $(C_SUBDIR)/*/*/*.s)
 C_ASM_OBJS := $(patsubst $(C_SUBDIR)/%.s,$(C_BUILDDIR)/%.o,$(C_ASM_SRCS))

 ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s)
@@ -202,46 +209,34 @@ SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS))
 MID_SRCS := $(wildcard $(MID_SUBDIR)/*.mid)
 MID_OBJS := $(patsubst $(MID_SUBDIR)/%.mid,$(MID_BUILDDIR)/%.o,$(MID_SRCS))

-OBJS     := $(C_OBJS) $(GFLIB_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
+OBJS     := $(C_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
 OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))

 SUBDIRS  := $(sort $(dir $(OBJS)))
 $(shell mkdir -p $(SUBDIRS))
-endif

-AUTO_GEN_TARGETS :=
-
-all: rom
-
-tools: $(TOOLDIRS)
-
-syms: $(SYM)
-
-$(TOOLDIRS):
-	@$(MAKE) -C $@
+# Pretend rules that are actually flags defer to `make all`
+modern: all
+compare: all

+# Other rules
 rom: $(ROM)
 ifeq ($(COMPARE),1)
 	@$(SHA1) rom.sha1
 endif

-# For contributors to make sure a change didn't affect the contents of the ROM.
-compare: all
+syms: $(SYM)

-clean: mostlyclean clean-tools
+clean: tidy clean-tools clean-generated clean-assets
+	@$(MAKE) clean -C libagbsyscall

-clean-tools:
-	@$(foreach tooldir,$(TOOLDIRS),$(MAKE) clean -C $(tooldir);)
-
-mostlyclean: tidynonmodern tidymodern
-	find sound -iname '*.bin' -exec rm {} +
+clean-assets:
 	rm -f $(MID_SUBDIR)/*.s
-	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
 	rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc
 	rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc
+	find sound -iname '*.bin' -exec rm {} +
+	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
 	find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
-	rm -f $(AUTO_GEN_TARGETS)
-	@$(MAKE) clean -C libagbsyscall

 tidy: tidynonmodern tidymodern

@@ -253,146 +248,121 @@ tidymodern:
 	rm -f $(MODERN_ROM_NAME) $(MODERN_ELF_NAME) $(MODERN_MAP_NAME)
 	rm -rf $(MODERN_OBJ_DIR_NAME)

-ifneq ($(MODERN),0)
-$(C_BUILDDIR)/berry_crush.o: override CFLAGS += -Wno-address-of-packed-member
-endif
-
+# Other rules
 include graphics_file_rules.mk
 include map_data_rules.mk
 include spritesheet_rules.mk
 include json_data_rules.mk
-include songs.mk
+include audio_rules.mk

-%.s: ;
+generated: $(AUTO_GEN_TARGETS)
+
+%.s:   ;
 %.png: ;
 %.pal: ;
 %.aif: ;

-%.1bpp: %.png  ; $(GFX) $< $@
-%.4bpp: %.png  ; $(GFX) $< $@
-%.8bpp: %.png  ; $(GFX) $< $@
-%.gbapal: %.pal ; $(GFX) $< $@
-%.gbapal: %.png ; $(GFX) $< $@
-%.lz: % ; $(GFX) $< $@
-%.rl: % ; $(GFX) $< $@
-$(CRY_SUBDIR)/%.bin: $(CRY_SUBDIR)/%.aif ; $(AIF) $< $@ --compress
-sound/%.bin: sound/%.aif ; $(AIF) $< $@
+%.1bpp:   %.png  ; $(GFX) $< $@
+%.4bpp:   %.png  ; $(GFX) $< $@
+%.8bpp:   %.png  ; $(GFX) $< $@
+%.gbapal: %.pal  ; $(GFX) $< $@
+%.gbapal: %.png  ; $(GFX) $< $@
+%.lz:     %      ; $(GFX) $< $@
+%.rl:     %      ; $(GFX) $< $@

+# NOTE: Tools must have been built prior (FIXME)
+generated: tools $(AUTO_GEN_TARGETS)
+clean-generated:
+	-rm -f $(AUTO_GEN_TARGETS)

 ifeq ($(MODERN),0)
-$(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc$(EXE)
+$(C_BUILDDIR)/libc.o: CC1 := $(TOOLS_DIR)/agbcc/bin/old_agbcc$(EXE)
 $(C_BUILDDIR)/libc.o: CFLAGS := -O2
-
 $(C_BUILDDIR)/siirtc.o: CFLAGS := -mthumb-interwork
-
 $(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork
 $(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
 $(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
-
 $(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc$(EXE)
-
 $(C_BUILDDIR)/record_mixing.o: CFLAGS += -ffreestanding
-$(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm$(EXE)
+$(C_BUILDDIR)/librfu_intr.o: CC1 := $(TOOLS_DIR)/agbcc/bin/agbcc_arm$(EXE)
 $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
 else
 $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
+$(C_BUILDDIR)/berry_crush.o: override CFLAGS += -Wno-address-of-packed-member
 endif

-ifeq ($(DINFO),1)
-override CFLAGS += -g
-endif
+# Dependency rules (for the *.c & *.s sources to .o files)
+# Have to be explicit or else missing files won't be reported.

-# The dep rules have to be explicit or else missing files won't be reported.
 # As a side effect, they're evaluated immediately instead of when the rule is invoked.
-# It doesn't look like $(shell) can be deferred so there might not be a better way.
+# It doesn't look like $(shell) can be deferred so there might not be a better way (Icedude_907: there is soon).

-ifeq ($(SCAN_DEPS),1)
-ifeq ($(NODEP),1)
-$(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.c
-ifeq (,$(KEEP_TEMPS))
-	@echo "$(CC1) <flags> -o $@ $<"
-	@$(CPP) $(CPPFLAGS) $< | $(PREPROC) -i $< charmap.txt | $(CC1) $(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $(AS) $(ASFLAGS) -o $@ -
-else
-	@$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i
-	@$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s
-	@echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s
-	$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s
-endif
-else
+# For C dependencies.
+# Args: $1 = Output file without extension (build/assets/src/data), $2 = Input file (src/data.c)
 define C_DEP
-$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib $2)
-ifeq (,$$(KEEP_TEMPS))
+$(call C_DEP_IMPL,$1,$2,$1)
+endef
+# Internal implementation details.
+# $1: Output file without extension, $2 input file, $3 temp path (if keeping)
+define C_DEP_IMPL
+$1.o: $2
+ifneq ($(KEEP_TEMPS),1)
 	@echo "$$(CC1) <flags> -o $$@ $$<"
 	@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) -i $$< charmap.txt | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
 else
-	@$$(CPP) $$(CPPFLAGS) $$< -o $$(C_BUILDDIR)/$3.i
-	@$$(PREPROC) $$(C_BUILDDIR)/$3.i charmap.txt | $$(CC1) $$(CFLAGS) -o $$(C_BUILDDIR)/$3.s
-	@echo -e ".text\n\t.align\t2, 0\n" >> $$(C_BUILDDIR)/$3.s
-	$$(AS) $$(ASFLAGS) -o $$@ $$(C_BUILDDIR)/$3.s
+	@$$(CPP) $$(CPPFLAGS) $$< -o $3.i
+	@$$(PREPROC) $3.i charmap.txt | $$(CC1) $$(CFLAGS) -o $3.s
+	@echo -e ".text\n\t.align\t2, 0\n" >> $3.s
+	$$(AS) $$(ASFLAGS) -o $$@ $3.s
+endif
+$1.d: $2
+	$(SCANINC) -M $1.d $(INCLUDE_SCANINC_ARGS) -I tools/agbcc/include $2
+ifneq ($(NODEP),1)
+$1.o: $1.d
+-include $1.d
 endif
 endef
-$(foreach src, $(C_SRCS), $(eval $(call C_DEP,$(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(src)),$(src),$(patsubst $(C_SUBDIR)/%.c,%,$(src)))))
+
+# Create generic rules if no dependency scanning, else create the real rules
+ifeq ($(NODEP),1)
+$(eval $(call C_DEP,$(C_BUILDDIR)/%,$(C_SUBDIR)/%.c))
+else
+$(foreach src,$(C_SRCS),$(eval $(call C_DEP,$(OBJ_DIR)/$(basename $(src)),$(src))))
 endif

-ifeq ($(NODEP),1)
-$(GFLIB_BUILDDIR)/%.o: $(GFLIB_SUBDIR)/%.c $$(c_dep)
-ifeq (,$(KEEP_TEMPS))
-	@echo "$(CC1) <flags> -o $@ $<"
-	@$(CPP) $(CPPFLAGS) $< | $(PREPROC) -i $< charmap.txt | $(CC1) $(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $(AS) $(ASFLAGS) -o $@ -
-else
-	@$(CPP) $(CPPFLAGS) $< -o $(GFLIB_BUILDDIR)/$*.i
-	@$(PREPROC) $(GFLIB_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(GFLIB_BUILDDIR)/$*.s
-	@echo -e ".text\n\t.align\t2, 0\n" >> $(GFLIB_BUILDDIR)/$*.s
-	$(AS) $(ASFLAGS) -o $@ $(GFLIB_BUILDDIR)/$*.s
-endif
-else
-define GFLIB_DEP
-$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib $2)
-ifeq (,$$(KEEP_TEMPS))
-	@echo "$$(CC1) <flags> -o $$@ $$<"
-	@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) -i $$< charmap.txt | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
-else
-	@$$(CPP) $$(CPPFLAGS) $$< -o $$(GFLIB_BUILDDIR)/$3.i
-	@$$(PREPROC) $$(GFLIB_BUILDDIR)/$3.i charmap.txt | $$(CC1) $$(CFLAGS) -o $$(GFLIB_BUILDDIR)/$3.s
-	@echo -e ".text\n\t.align\t2, 0\n" >> $$(GFLIB_BUILDDIR)/$3.s
-	$$(AS) $$(ASFLAGS) -o $$@ $$(GFLIB_BUILDDIR)/$3.s
-endif
-endef
-$(foreach src, $(GFLIB_SRCS), $(eval $(call GFLIB_DEP,$(patsubst $(GFLIB_SUBDIR)/%.c,$(GFLIB_BUILDDIR)/%.o, $(src)),$(src),$(patsubst $(GFLIB_SUBDIR)/%.c,%, $(src)))))
-endif
-
-ifeq ($(NODEP),1)
-$(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.s
-	$(PREPROC) $< charmap.txt | $(CPP) -I include - | $(PREPROC) -i $$< charmap.txt | $(AS) $(ASFLAGS) -o $@
-else
-define SRC_ASM_DATA_DEP
-$1: $2 $$(shell $(SCANINC) -I include -I "" $2)
-	$$(PREPROC) $$< charmap.txt | $$(CPP) -I include - | $$(PREPROC) -ie $$< charmap.txt | $$(AS) $$(ASFLAGS) -o $$@
-endef
-$(foreach src, $(C_ASM_SRCS), $(eval $(call SRC_ASM_DATA_DEP,$(patsubst $(C_SUBDIR)/%.s,$(C_BUILDDIR)/%.o, $(src)),$(src))))
-endif
-
-ifeq ($(NODEP),1)
-$(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s
-	$(AS) $(ASFLAGS) -o $@ $<
-else
+# Similar methodology for Assembly files
+# $1: Output path without extension, $2: Input file (`*.s`)
 define ASM_DEP
-$1: $2 $$(shell $(SCANINC) -I include -I "" $2)
+$1.o: $2
 	$$(AS) $$(ASFLAGS) -o $$@ $$<
+$(call ASM_SCANINC,$1,$2)
+endef
+# As above but first doing a preprocessor pass
+define ASM_DEP_PREPROC
+$1.o: $2
+	$$(PREPROC) $$< charmap.txt | $$(CPP) $(INCLUDE_SCANINC_ARGS) - | $$(PREPROC) -ie $$< charmap.txt | $$(AS) $$(ASFLAGS) -o $$@
+$(call ASM_SCANINC,$1,$2)
 endef
-$(foreach src, $(ASM_SRCS), $(eval $(call ASM_DEP,$(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o, $(src)),$(src))))
-endif

+define ASM_SCANINC
+ifneq ($(NODEP),1)
+$1.o: $1.d
+$1.d: $2
+	$(SCANINC) -M $1.d $(INCLUDE_SCANINC_ARGS) -I "" $2
+-include $1.d
+endif
+endef
+
+# Dummy rules or real rules
 ifeq ($(NODEP),1)
-$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s
-	$(PREPROC) $< charmap.txt | $(CPP) -I include - | $(PREPROC) -ie $$< charmap.txt | $(AS) $(ASFLAGS) -o $@
+$(eval $(call ASM_DEP,$(ASM_BUILDDIR)/%,$(ASM_SUBDIR)/%.s))
+$(eval $(call ASM_DEP_PREPROC,$(C_BUILDDIR)/%,$(C_SUBDIR)/%.s))
+$(eval $(call ASM_DEP_PREPROC,$(DATA_ASM_BUILDDIR)/%,$(DATA_ASM_SUBDIR)/%.s))
 else
-$(foreach src, $(REGULAR_DATA_ASM_SRCS), $(eval $(call SRC_ASM_DATA_DEP,$(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o, $(src)),$(src))))
+$(foreach src, $(ASM_SRCS), $(eval $(call ASM_DEP,$(src:%.s=$(OBJ_DIR)/%),$(src))))
+$(foreach src, $(C_ASM_SRCS), $(eval $(call ASM_DEP_PREPROC,$(src:%.s=$(OBJ_DIR)/%),$(src))))
+$(foreach src, $(REGULAR_DATA_ASM_SRCS), $(eval $(call ASM_DEP_PREPROC,$(src:%.s=$(OBJ_DIR)/%),$(src))))
 endif
-endif
-
-$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
-	$(AS) $(ASFLAGS) -I sound -o $@ $<

 $(OBJ_DIR)/sym_bss.ld: sym_bss.txt
 	$(RAMSCRGEN) .bss $< ENGLISH > $@
@@ -403,6 +373,7 @@ $(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt)
 $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
 	$(RAMSCRGEN) ewram_data $< ENGLISH > $@

+# Linker script
 ifeq ($(MODERN),0)
 LD_SCRIPT := ld_script.ld
 LD_SCRIPT_DEPS := $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld
@@ -411,27 +382,21 @@ LD_SCRIPT := ld_script_modern.ld
 LD_SCRIPT_DEPS :=
 endif

-$(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS)
-	cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT) > ld_script.ld
-
-LDFLAGS = -Map ../../$(MAP)
-$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) libagbsyscall
-	@echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ <objects> <lib>"
-	@cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld --print-memory-usage -o ../../$@ $(OBJS_REL) $(LIB) | cat
-	$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
-
-$(ROM): $(ELF)
-	$(OBJCOPY) -O binary $< $@
-	$(FIX) $@ -p --silent
-
-modern: all
+# Final rules

 libagbsyscall:
 	@$(MAKE) -C libagbsyscall TOOLCHAIN=$(TOOLCHAIN) MODERN=$(MODERN)

-###################
-### Symbol file ###
-###################
+# Elf from object files
+$(ELF): $(LD_SCRIPT) $(LD_SCRIPT_DEPS) $(OBJS) libagbsyscall
+	@cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../../$< --print-memory-usage -o ../../$@ $(OBJS_REL) $(LIB) | cat
+	$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent

+# Builds the rom from the elf file
+$(ROM): $(ELF)
+	$(OBJCOPY) -O binary $< $@
+	$(FIX) $@ -p --silent
+
+# Symbol file (`make syms`)
 $(SYM): $(ELF)
 	$(OBJDUMP) -t $< | sort -u | grep -E "^0[2389]" | $(PERL) -p -e 's/^(\w{8}) (\w).{6} \S+\t(\w{8}) (\S+)$$/\1 \2 \3 \4/g' > $@
--- a/asm/macros/contest_ai_script.inc
+++ b/asm/macros/contest_ai_script.inc
@@ -141,25 +141,25 @@

 	.macro if_points_less_than num:req, destination:req
 	.byte 0x16
-	.byte \num
+	.2byte \num
 	.4byte \destination
 	.endm

 	.macro if_points_more_than num:req, destination:req
 	.byte 0x17
-	.byte \num
+	.2byte \num
 	.4byte \destination
 	.endm

 	.macro if_points_eq num:req, destination:req
 	.byte 0x18
-	.byte \num
+	.2byte \num
 	.4byte \destination
 	.endm

 	.macro if_points_not_eq num:req, destination:req
 	.byte 0x19
-	.byte \num
+	.2byte \num
 	.4byte \destination
 	.endm

@@ -171,25 +171,25 @@

 	.macro if_preliminary_points_less_than num:req, destination:req
 	.byte 0x1B
-	.byte \num
+	.2byte \num
 	.4byte \destination
 	.endm

 	.macro if_preliminary_points_more_than num:req, destination:req
 	.byte 0x1C
-	.byte \num
+	.2byte \num
 	.4byte \destination
 	.endm

 	.macro if_preliminary_points_eq num:req, destination:req
 	.byte 0x1D
-	.byte \num
+	.2byte \num
 	.4byte \destination
 	.endm

 	.macro if_preliminary_points_not_eq num:req, destination:req
 	.byte 0x1E
-	.byte \num
+	.2byte \num
 	.4byte \destination
 	.endm

--- a/audio_rules.mk
+++ b/audio_rules.mk
@@ -0,0 +1,45 @@
+# This file contains rules for making assemblies for most music in the game.
+
+CRY_SUBDIR := sound/direct_sound_samples/cries
+
+MID_ASM_DIR := $(MID_SUBDIR)
+CRY_BIN_DIR := $(CRY_SUBDIR)
+SOUND_BIN_DIR := sound
+
+SPECIAL_OUTDIRS := $(MID_ASM_DIR) $(CRY_BIN_DIR) 
+SPECIAL_OUTDIRS += $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/direct_sound_samples/phonemes $(SOUND_BIN_DIR)/direct_sound_samples/cries
+$(shell mkdir -p $(SPECIAL_OUTDIRS) )
+
+# Assembly song compilation
+$(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
+	$(AS) $(ASFLAGS) -I sound -o $@ $<
+$(MID_BUILDDIR)/%.o: $(MID_ASM_DIR)/%.s
+	$(AS) $(ASFLAGS) -I sound -o $@ $<
+
+# Compressed cries
+$(CRY_BIN_DIR)/%.bin: $(CRY_SUBDIR)/%.aif 
+	$(AIF) $< $@ --compress
+
+# Uncompressed sounds
+$(SOUND_BIN_DIR)/%.bin: sound/%.aif 
+	$(AIF) $< $@
+
+# For each line in midi.cfg, we do some trickery to convert it into a make rule for the `.mid` file described on the line
+# Data following the colon in said file corresponds to arguments passed into mid2agb
+MID_CFG_PATH := $(MID_SUBDIR)/midi.cfg
+
+# $1: Source path no extension, $2 Options
+define MID_RULE
+$(MID_ASM_DIR)/$1.s: $(MID_SUBDIR)/$1.mid $(MID_CFG_PATH)
+	$(MID) $$< $$@ $2
+endef
+#                            source path,                             remaining text (options)
+define MID_EXPANSION
+	$(eval $(call MID_RULE,$(basename $(patsubst %:,%,$(word 1,$1))),$(wordlist 2,999,$1)))
+endef
+
+$(foreach line,$(shell cat $(MID_CFG_PATH) | sed "s/ /__SPACE__/g"),$(call MID_EXPANSION,$(subst __SPACE__, ,$(line))))
+
+# Warn users building without a .cfg - build will fail at link time
+$(MID_ASM_DIR)/%.s: $(MID_SUBDIR)/%.mid
+	$(warning $< does not have an associated entry in midi.cfg! It cannot be built)
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -563,8 +563,8 @@ gStdScripts_End::
 	.include "data/maps/Route110_TrickHousePuzzle6/scripts.inc"
 	.include "data/maps/Route110_TrickHousePuzzle7/scripts.inc"
 	.include "data/maps/Route110_TrickHousePuzzle8/scripts.inc"
-	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc"
 	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc"
 	.include "data/maps/Route113_GlassWorkshop/scripts.inc"
 	.include "data/maps/Route123_BerryMastersHouse/scripts.inc"
 	.include "data/maps/Route119_WeatherInstitute_1F/scripts.inc"
--- a/data/maps/Route110/map.json
+++ b/data/maps/Route110/map.json
@@ -518,28 +518,28 @@
      "x": 15,
      "y": 16,
      "elevation": 0,
-      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
+      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
      "dest_warp_id": "0"
    },
    {
      "x": 18,
      "y": 16,
      "elevation": 0,
-      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
+      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
      "dest_warp_id": "2"
    },
    {
      "x": 16,
      "y": 88,
      "elevation": 0,
-      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
+      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
      "dest_warp_id": "0"
    },
    {
      "x": 19,
      "y": 88,
      "elevation": 0,
-      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
+      "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
      "dest_warp_id": "2"
    }
  ],
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
@@ -34,28 +34,28 @@
      "y": 5,
      "elevation": 0,
      "dest_map": "MAP_ROUTE110",
-      "dest_warp_id": "4"
+      "dest_warp_id": "2"
    },
    {
      "x": 2,
      "y": 5,
      "elevation": 0,
      "dest_map": "MAP_ROUTE110",
-      "dest_warp_id": "4"
+      "dest_warp_id": "2"
    },
    {
      "x": 12,
      "y": 5,
      "elevation": 0,
      "dest_map": "MAP_ROUTE110",
-      "dest_warp_id": "5"
+      "dest_warp_id": "3"
    },
    {
      "x": 13,
      "y": 5,
      "elevation": 0,
      "dest_map": "MAP_ROUTE110",
-      "dest_warp_id": "5"
+      "dest_warp_id": "3"
    }
  ],
  "coord_events": [
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
@@ -1,6 +1,16 @@
 Route110_SeasideCyclingRoadNorthEntrance_MapScripts::
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadNorthEntrance_OnTransition
 	.byte 0

+Route110_SeasideCyclingRoadNorthEntrance_OnTransition:
+	call_if_eq VAR_CYCLING_CHALLENGE_STATE, 3, Route110_SeasideCyclingRoadNorthEntrance_EventScript_RestartChallenge
+	call_if_eq VAR_CYCLING_CHALLENGE_STATE, 2, Route110_SeasideCyclingRoadNorthEntrance_EventScript_RestartChallenge
+	end
+
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_RestartChallenge::
+	setvar VAR_CYCLING_CHALLENGE_STATE, 1
+	return
+
 Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk::
 	lock
 	faceplayer
@@ -11,12 +21,17 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk::
 Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck::
 	lockall
 	specialvar VAR_RESULT, GetPlayerAvatarBike
+	call_if_eq VAR_RESULT, 2, Route110_SeasideCyclingRoadNorthEntrance_EventScript_OnMachBike
 	goto_if_eq VAR_RESULT, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike
 	setflag FLAG_SYS_CYCLING_ROAD
 	setvar VAR_TEMP_1, 1
 	releaseall
 	end

+Route110_SeasideCyclingRoadNorthEntrance_EventScript_OnMachBike::
+	setvar VAR_CYCLING_CHALLENGE_STATE, 1
+	return
+
 Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike::
 	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT
 	closemessage
@@ -31,6 +46,7 @@ Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter:

 Route110_SeasideCyclingRoadNorthEntrance_EventScript_ClearCyclingRoad::
 	lockall
+	setvar VAR_CYCLING_CHALLENGE_STATE, 0
 	clearflag FLAG_SYS_CYCLING_ROAD
 	setvar VAR_TEMP_1, 0
 	releaseall
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
@@ -34,28 +34,28 @@
      "y": 5,
      "elevation": 0,
      "dest_map": "MAP_ROUTE110",
-      "dest_warp_id": "2"
+      "dest_warp_id": "4"
    },
    {
      "x": 2,
      "y": 5,
      "elevation": 0,
      "dest_map": "MAP_ROUTE110",
-      "dest_warp_id": "2"
+      "dest_warp_id": "4"
    },
    {
      "x": 12,
      "y": 5,
      "elevation": 0,
      "dest_map": "MAP_ROUTE110",
-      "dest_warp_id": "3"
+      "dest_warp_id": "5"
    },
    {
      "x": 13,
      "y": 5,
      "elevation": 0,
      "dest_map": "MAP_ROUTE110",
-      "dest_warp_id": "3"
+      "dest_warp_id": "5"
    }
  ],
  "coord_events": [
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
@@ -1,16 +1,6 @@
 Route110_SeasideCyclingRoadSouthEntrance_MapScripts::
-	map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_OnTransition
 	.byte 0

-Route110_SeasideCyclingRoadSouthEntrance_OnTransition:
-	call_if_eq VAR_CYCLING_CHALLENGE_STATE, 3, Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge
-	call_if_eq VAR_CYCLING_CHALLENGE_STATE, 2, Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge
-	end
-
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge::
-	setvar VAR_CYCLING_CHALLENGE_STATE, 1
-	return
-
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk::
 	lock
 	faceplayer
@@ -21,17 +11,12 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk::
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck::
 	lockall
 	specialvar VAR_RESULT, GetPlayerAvatarBike
-	call_if_eq VAR_RESULT, 2, Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike
 	goto_if_eq VAR_RESULT, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike
 	setflag FLAG_SYS_CYCLING_ROAD
 	setvar VAR_TEMP_1, 1
 	releaseall
 	end

-Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike::
-	setvar VAR_CYCLING_CHALLENGE_STATE, 1
-	return
-
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike::
 	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT
 	closemessage
@@ -46,7 +31,6 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter:

 Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad::
 	lockall
-	setvar VAR_CYCLING_CHALLENGE_STATE, 0
 	clearflag FLAG_SYS_CYCLING_ROAD
 	setvar VAR_TEMP_1, 0
 	releaseall
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -604,8 +604,8 @@
    "Route110_TrickHousePuzzle6",
    "Route110_TrickHousePuzzle7",
    "Route110_TrickHousePuzzle8",
-    "Route110_SeasideCyclingRoadNorthEntrance",
-    "Route110_SeasideCyclingRoadSouthEntrance"
+    "Route110_SeasideCyclingRoadSouthEntrance",
+    "Route110_SeasideCyclingRoadNorthEntrance"
  ],
  "gMapGroup_IndoorRoute113": [
    "Route113_GlassWorkshop"
--- a/include/bg.h
+++ b/include/bg.h
--- a/include/blit.h
+++ b/include/blit.h
--- a/include/constants/.gitignore
+++ b/include/constants/.gitignore
@@ -0,0 +1,3 @@
+# Will be moved to build/ eventually
+map_groups.h
+layouts.h
--- a/include/constants/characters.h
+++ b/include/constants/characters.h
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -1,450 +0,0 @@
-#ifndef GUARD_CONSTANTS_LAYOUTS_H
-#define GUARD_CONSTANTS_LAYOUTS_H
-
-//
-// DO NOT MODIFY THIS FILE! It is auto-generated from data/layouts/layouts.json
-//
-
-#define LAYOUT_PETALBURG_CITY 1
-#define LAYOUT_SLATEPORT_CITY 2
-#define LAYOUT_MAUVILLE_CITY 3
-#define LAYOUT_RUSTBORO_CITY 4
-#define LAYOUT_FORTREE_CITY 5
-#define LAYOUT_LILYCOVE_CITY 6
-#define LAYOUT_MOSSDEEP_CITY 7
-#define LAYOUT_SOOTOPOLIS_CITY 8
-#define LAYOUT_EVER_GRANDE_CITY 9
-#define LAYOUT_LITTLEROOT_TOWN 10
-#define LAYOUT_OLDALE_TOWN 11
-#define LAYOUT_DEWFORD_TOWN 12
-#define LAYOUT_LAVARIDGE_TOWN 13
-#define LAYOUT_FALLARBOR_TOWN 14
-#define LAYOUT_VERDANTURF_TOWN 15
-#define LAYOUT_PACIFIDLOG_TOWN 16
-#define LAYOUT_ROUTE101 17
-#define LAYOUT_ROUTE102 18
-#define LAYOUT_ROUTE103 19
-#define LAYOUT_ROUTE104 20
-#define LAYOUT_ROUTE105 21
-#define LAYOUT_ROUTE106 22
-#define LAYOUT_ROUTE107 23
-#define LAYOUT_ROUTE108 24
-#define LAYOUT_ROUTE109 25
-#define LAYOUT_ROUTE110 26
-#define LAYOUT_ROUTE111 27
-#define LAYOUT_ROUTE112 28
-#define LAYOUT_ROUTE113 29
-#define LAYOUT_ROUTE114 30
-#define LAYOUT_ROUTE115 31
-#define LAYOUT_ROUTE116 32
-#define LAYOUT_ROUTE117 33
-#define LAYOUT_ROUTE118 34
-#define LAYOUT_ROUTE119 35
-#define LAYOUT_ROUTE120 36
-#define LAYOUT_ROUTE121 37
-#define LAYOUT_ROUTE122 38
-#define LAYOUT_ROUTE123 39
-#define LAYOUT_ROUTE124 40
-#define LAYOUT_ROUTE125 41
-#define LAYOUT_ROUTE126 42
-#define LAYOUT_ROUTE127 43
-#define LAYOUT_ROUTE128 44
-#define LAYOUT_ROUTE129 45
-#define LAYOUT_ROUTE130_MIRAGE_ISLAND 46
-#define LAYOUT_ROUTE131 47
-#define LAYOUT_ROUTE132 48
-#define LAYOUT_ROUTE133 49
-#define LAYOUT_ROUTE134 50
-#define LAYOUT_UNDERWATER_ROUTE126 51
-#define LAYOUT_UNDERWATER_ROUTE127 52
-#define LAYOUT_UNDERWATER_ROUTE128 53
-#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F 54
-#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 55
-#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F 56
-#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 57
-#define LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB 58
-#define LAYOUT_HOUSE1 59
-#define LAYOUT_HOUSE2 60
-#define LAYOUT_POKEMON_CENTER_1F 61
-#define LAYOUT_POKEMON_CENTER_2F 62
-#define LAYOUT_MART 63
-#define LAYOUT_HOUSE3 64
-#define LAYOUT_DEWFORD_TOWN_GYM 65
-#define LAYOUT_DEWFORD_TOWN_HALL 66
-#define LAYOUT_HOUSE4 67
-#define LAYOUT_LAVARIDGE_TOWN_HERB_SHOP 68
-#define LAYOUT_LAVARIDGE_TOWN_GYM_1F 69
-#define LAYOUT_LAVARIDGE_TOWN_GYM_B1F 70
-#define LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F 71
-#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72
-#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73
-#define LAYOUT_LILYCOVE_CITY_HOUSE2 74
-#define LAYOUT_UNUSED_CONTEST_ROOM1 75
-#define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76
-#define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77
-#define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78
-#define LAYOUT_PETALBURG_CITY_GYM 79
-#define LAYOUT_HOUSE_WITH_BED 80
-#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81
-#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82
-#define LAYOUT_UNUSED_CONTEST_ROOM2 83
-#define LAYOUT_UNUSED_CONTEST_ROOM3 84
-#define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85
-#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86
-#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87
-#define LAYOUT_HARBOR 88
-#define LAYOUT_MAUVILLE_CITY_GYM 89
-#define LAYOUT_MAUVILLE_CITY_BIKE_SHOP 90
-#define LAYOUT_MAUVILLE_CITY_GAME_CORNER 91
-#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F 92
-#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F 93
-#define LAYOUT_RUSTBORO_CITY_GYM 94
-#define LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL 95
-#define LAYOUT_RUSTBORO_CITY_HOUSE 96
-#define LAYOUT_RUSTBORO_CITY_HOUSE1 97
-#define LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE 98
-#define LAYOUT_FORTREE_CITY_HOUSE1 99
-#define LAYOUT_FORTREE_CITY_GYM 100
-#define LAYOUT_FORTREE_CITY_HOUSE2 101
-#define LAYOUT_ROUTE104_MR_BRINEYS_HOUSE 102
-#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F 103
-#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F 104
-#define LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY 105
-#define LAYOUT_LILYCOVE_CITY_CONTEST_HALL 106
-#define LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB 107
-#define LAYOUT_MOSSDEEP_CITY_GYM 108
-#define LAYOUT_SOOTOPOLIS_CITY_GYM_1F 109
-#define LAYOUT_SOOTOPOLIS_CITY_GYM_B1F 110
-#define LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM 111
-#define LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM 112
-#define LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM 113
-#define LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM 114
-#define LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM 115
-#define LAYOUT_EVER_GRANDE_CITY_SHORT_HALL 116
-#define LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP 117
-#define LAYOUT_CABLE_CAR_STATION 118
-#define LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE 119
-#define LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL 120
-#define LAYOUT_ROUTE114_LANETTES_HOUSE 121
-#define LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE 122
-#define LAYOUT_ROUTE117_POKEMON_DAY_CARE 123
-#define LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE 124
-#define LAYOUT_METEOR_FALLS_1F_1R 125
-#define LAYOUT_METEOR_FALLS_1F_2R 126
-#define LAYOUT_METEOR_FALLS_B1F_1R 127
-#define LAYOUT_METEOR_FALLS_B1F_2R 128
-#define LAYOUT_RUSTURF_TUNNEL 129
-#define LAYOUT_UNDERWATER_SOOTOPOLIS_CITY 130
-#define LAYOUT_DESERT_RUINS 131
-#define LAYOUT_GRANITE_CAVE_1F 132
-#define LAYOUT_GRANITE_CAVE_B1F 133
-#define LAYOUT_GRANITE_CAVE_B2F 134
-#define LAYOUT_PETALBURG_WOODS 135
-#define LAYOUT_MT_CHIMNEY 136
-#define LAYOUT_MT_PYRE_1F 137
-#define LAYOUT_MT_PYRE_2F 138
-#define LAYOUT_MT_PYRE_3F 139
-#define LAYOUT_MT_PYRE_4F 140
-#define LAYOUT_MT_PYRE_5F 141
-#define LAYOUT_MT_PYRE_6F 142
-#define LAYOUT_AQUA_HIDEOUT_1F 143
-#define LAYOUT_AQUA_HIDEOUT_B1F 144
-#define LAYOUT_AQUA_HIDEOUT_B2F 145
-#define LAYOUT_UNDERWATER_SEAFLOOR_CAVERN 146
-#define LAYOUT_SEAFLOOR_CAVERN_ENTRANCE 147
-#define LAYOUT_SEAFLOOR_CAVERN_ROOM1 148
-#define LAYOUT_SEAFLOOR_CAVERN_ROOM2 149
-#define LAYOUT_SEAFLOOR_CAVERN_ROOM3 150
-#define LAYOUT_SEAFLOOR_CAVERN_ROOM4 151
-#define LAYOUT_SEAFLOOR_CAVERN_ROOM5 152
-#define LAYOUT_SEAFLOOR_CAVERN_ROOM6 153
-#define LAYOUT_SEAFLOOR_CAVERN_ROOM7 154
-#define LAYOUT_SEAFLOOR_CAVERN_ROOM8 155
-#define LAYOUT_SEAFLOOR_CAVERN_ROOM9 156
-#define LAYOUT_CAVE_OF_ORIGIN_ENTRANCE 157
-#define LAYOUT_CAVE_OF_ORIGIN_1F 158
-#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 159
-#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 160
-#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 161
-#define LAYOUT_CAVE_OF_ORIGIN_B1F 162
-#define LAYOUT_VICTORY_ROAD_1F 163
-#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM 164
-#define LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM 165
-#define LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM 166
-#define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167
-#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168
-#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169
-#define LAYOUT_UNUSED_CAVE1 170
-#define LAYOUT_UNUSED_CAVE2 171
-#define LAYOUT_UNUSED_CAVE3 172
-#define LAYOUT_UNUSED_CAVE4 173
-#define LAYOUT_UNUSED_CAVE5 174
-#define LAYOUT_UNUSED_CAVE6 175
-#define LAYOUT_UNUSED_CAVE7 176
-#define LAYOUT_UNUSED_CAVE8 177
-#define LAYOUT_UNUSED_CAVE9 178
-#define LAYOUT_UNUSED_CAVE10 179
-#define LAYOUT_UNUSED_CAVE11 180
-#define LAYOUT_UNUSED_CAVE12 181
-#define LAYOUT_UNUSED_CAVE13 182
-#define LAYOUT_UNUSED_CAVE14 183
-#define LAYOUT_NEW_MAUVILLE_ENTRANCE 184
-#define LAYOUT_NEW_MAUVILLE_INSIDE 185
-#define LAYOUT_ABANDONED_SHIP_DECK 186
-#define LAYOUT_ABANDONED_SHIP_CORRIDORS_1F 187
-#define LAYOUT_ABANDONED_SHIP_ROOMS_1F 188
-#define LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F 189
-#define LAYOUT_ABANDONED_SHIP_ROOMS_B1F 190
-#define LAYOUT_ABANDONED_SHIP_ROOMS2_B1F 191
-#define LAYOUT_ABANDONED_SHIP_UNDERWATER1 192
-#define LAYOUT_ABANDONED_SHIP_ROOM_B1F 193
-#define LAYOUT_ABANDONED_SHIP_ROOMS2_1F 194
-#define LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE 195
-#define LAYOUT_ABANDONED_SHIP_UNDERWATER2 196
-#define LAYOUT_SECRET_BASE_RED_CAVE1 197
-#define LAYOUT_SECRET_BASE_BROWN_CAVE1 198
-#define LAYOUT_SECRET_BASE_BLUE_CAVE1 199
-#define LAYOUT_SECRET_BASE_YELLOW_CAVE1 200
-#define LAYOUT_SECRET_BASE_TREE1 201
-#define LAYOUT_SECRET_BASE_SHRUB1 202
-#define LAYOUT_SECRET_BASE_RED_CAVE2 203
-#define LAYOUT_SECRET_BASE_BROWN_CAVE2 204
-#define LAYOUT_SECRET_BASE_BLUE_CAVE2 205
-#define LAYOUT_SECRET_BASE_YELLOW_CAVE2 206
-#define LAYOUT_SECRET_BASE_TREE2 207
-#define LAYOUT_SECRET_BASE_SHRUB2 208
-#define LAYOUT_SECRET_BASE_RED_CAVE3 209
-#define LAYOUT_SECRET_BASE_BROWN_CAVE3 210
-#define LAYOUT_SECRET_BASE_BLUE_CAVE3 211
-#define LAYOUT_SECRET_BASE_YELLOW_CAVE3 212
-#define LAYOUT_SECRET_BASE_TREE3 213
-#define LAYOUT_SECRET_BASE_SHRUB3 214
-#define LAYOUT_SECRET_BASE_RED_CAVE4 215
-#define LAYOUT_SECRET_BASE_BROWN_CAVE4 216
-#define LAYOUT_SECRET_BASE_BLUE_CAVE4 217
-#define LAYOUT_SECRET_BASE_YELLOW_CAVE4 218
-#define LAYOUT_SECRET_BASE_TREE4 219
-#define LAYOUT_SECRET_BASE_SHRUB4 220
-#define LAYOUT_BATTLE_COLOSSEUM_2P 221
-#define LAYOUT_TRADE_CENTER 222
-#define LAYOUT_RECORD_CORNER 223
-#define LAYOUT_BATTLE_COLOSSEUM_4P 224
-#define LAYOUT_CONTEST_HALL 225
-#define LAYOUT_UNUSED_CONTEST_HALL1 226
-#define LAYOUT_UNUSED_CONTEST_HALL2 227
-#define LAYOUT_UNUSED_CONTEST_HALL3 228
-#define LAYOUT_UNUSED_CONTEST_HALL4 229
-#define LAYOUT_UNUSED_CONTEST_HALL5 230
-#define LAYOUT_UNUSED_CONTEST_HALL6 231
-#define LAYOUT_CONTEST_HALL_BEAUTY 232
-#define LAYOUT_CONTEST_HALL_TOUGH 233
-#define LAYOUT_CONTEST_HALL_COOL 234
-#define LAYOUT_CONTEST_HALL_SMART 235
-#define LAYOUT_CONTEST_HALL_CUTE 236
-#define LAYOUT_INSIDE_OF_TRUCK 237
-#define LAYOUT_SAFARI_ZONE_NORTHWEST 238
-#define LAYOUT_SAFARI_ZONE_NORTH 239
-#define LAYOUT_SAFARI_ZONE_SOUTHWEST 240
-#define LAYOUT_SAFARI_ZONE_SOUTH 241
-#define LAYOUT_UNUSED_OUTDOOR_AREA 242
-#define LAYOUT_ROUTE109_SEASHORE_HOUSE 243
-#define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244
-#define LAYOUT_ROUTE110_TRICK_HOUSE_END 245
-#define LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR 246
-#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 247
-#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 248
-#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 249
-#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 250
-#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 251
-#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 252
-#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 253
-#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 254
-#define LAYOUT_FORTREE_CITY_DECORATION_SHOP 255
-#define LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE 256
-#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F 257
-#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F 258
-#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F 259
-#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F 260
-#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F 261
-#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP 262
-#define LAYOUT_ROUTE130 263
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY 264
-#define LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST 265
-#define LAYOUT_BATTLE_ELEVATOR 266
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR 267
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM 268
-#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F 269
-#define LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F 270
-#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F 271
-#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F 272
-#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR 273
-#define LAYOUT_UNDERWATER_ROUTE124 274
-#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F 275
-#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F 276
-#define LAYOUT_SS_TIDAL_CORRIDOR 277
-#define LAYOUT_SS_TIDAL_LOWER_DECK 278
-#define LAYOUT_SS_TIDAL_ROOMS 279
-#define LAYOUT_ISLAND_CAVE 280
-#define LAYOUT_ANCIENT_TOMB 281
-#define LAYOUT_UNDERWATER_ROUTE134 282
-#define LAYOUT_UNDERWATER_SEALED_CHAMBER 283
-#define LAYOUT_SEALED_CHAMBER_OUTER_ROOM 284
-#define LAYOUT_VICTORY_ROAD_B1F 285
-#define LAYOUT_VICTORY_ROAD_B2F 286
-#define LAYOUT_ROUTE104_PROTOTYPE 287
-#define LAYOUT_GRANITE_CAVE_STEVENS_ROOM 288
-#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS 289
-#define LAYOUT_SOUTHERN_ISLAND_EXTERIOR 290
-#define LAYOUT_SOUTHERN_ISLAND_INTERIOR 291
-#define LAYOUT_JAGGED_PASS 292
-#define LAYOUT_FIERY_PATH 293
-#define LAYOUT_RUSTBORO_CITY_FLAT2_1F 294
-#define LAYOUT_RUSTBORO_CITY_FLAT2_2F 295
-#define LAYOUT_RUSTBORO_CITY_FLAT2_3F 296
-#define LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE 297
-#define LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME 298
-#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F 299
-#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F 300
-#define LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE 301
-#define LAYOUT_MT_PYRE_EXTERIOR 302
-#define LAYOUT_MT_PYRE_SUMMIT 303
-#define LAYOUT_SEALED_CHAMBER_INNER_ROOM 304
-#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F 305
-#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F 306
-#define LAYOUT_SOOTOPOLIS_CITY_HOUSE1 307
-#define LAYOUT_SOOTOPOLIS_CITY_HOUSE2 308
-#define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 309
-#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS 310
-#define LAYOUT_SCORCHED_SLAB 311
-#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_B4F_LAVA 312
-#define LAYOUT_RUSTBORO_CITY_FLAT1_1F 313
-#define LAYOUT_RUSTBORO_CITY_FLAT1_2F 314
-#define LAYOUT_EVER_GRANDE_CITY_HALL4 315
-#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 316
-#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 317
-#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 318
-#define LAYOUT_ROUTE131_SKY_PILLAR 319
-#define LAYOUT_SKY_PILLAR_ENTRANCE 320
-#define LAYOUT_SKY_PILLAR_OUTSIDE 321
-#define LAYOUT_SKY_PILLAR_1F 322
-#define LAYOUT_SKY_PILLAR_2F 323
-#define LAYOUT_SKY_PILLAR_3F 324
-#define LAYOUT_SKY_PILLAR_4F 325
-#define LAYOUT_SEAFLOOR_CAVERN_ROOM9_LAVA 326
-#define LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE 327
-#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM 328
-#define LAYOUT_SAFARI_ZONE_REST_HOUSE 329
-#define LAYOUT_SKY_PILLAR_5F 330
-#define LAYOUT_SKY_PILLAR_TOP 331
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY 332
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR 333
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM 334
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM 335
-#define LAYOUT_MAGMA_HIDEOUT_1F 336
-#define LAYOUT_MAGMA_HIDEOUT_2F_1R 337
-#define LAYOUT_MAGMA_HIDEOUT_2F_2R 338
-#define LAYOUT_MAGMA_HIDEOUT_3F_1R 339
-#define LAYOUT_MAGMA_HIDEOUT_3F_2R 340
-#define LAYOUT_MAGMA_HIDEOUT_4F 341
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY 342
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR 343
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM 344
-#define LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST 345
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY 346
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM 347
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM 348
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY 349
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR 350
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM 351
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL 352
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL 353
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY 354
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR 355
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356
-#define LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE 357
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS 358
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_UNUSED 359
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR 361
-#define LAYOUT_BATTLE_PYRAMID_SQUARE01 362
-#define LAYOUT_BATTLE_PYRAMID_SQUARE02 363
-#define LAYOUT_BATTLE_PYRAMID_SQUARE03 364
-#define LAYOUT_BATTLE_PYRAMID_SQUARE04 365
-#define LAYOUT_BATTLE_PYRAMID_SQUARE05 366
-#define LAYOUT_BATTLE_PYRAMID_SQUARE06 367
-#define LAYOUT_BATTLE_PYRAMID_SQUARE07 368
-#define LAYOUT_BATTLE_PYRAMID_SQUARE08 369
-#define LAYOUT_BATTLE_PYRAMID_SQUARE09 370
-#define LAYOUT_BATTLE_PYRAMID_SQUARE10 371
-#define LAYOUT_BATTLE_PYRAMID_SQUARE11 372
-#define LAYOUT_BATTLE_PYRAMID_SQUARE12 373
-#define LAYOUT_BATTLE_PYRAMID_SQUARE13 374
-#define LAYOUT_BATTLE_PYRAMID_SQUARE14 375
-#define LAYOUT_BATTLE_PYRAMID_SQUARE15 376
-#define LAYOUT_BATTLE_PYRAMID_SQUARE16 377
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP 378
-#define LAYOUT_MAGMA_HIDEOUT_3F_3R 379
-#define LAYOUT_MAGMA_HIDEOUT_2F_3R 380
-#define LAYOUT_MIRAGE_TOWER_1F 381
-#define LAYOUT_MIRAGE_TOWER_2F 382
-#define LAYOUT_MIRAGE_TOWER_3F 383
-#define LAYOUT_BATTLE_TENT_LOBBY 384
-#define LAYOUT_BATTLE_TENT_CORRIDOR 385
-#define LAYOUT_BATTLE_TENT_BATTLE_ROOM 386
-#define LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM 387
-#define LAYOUT_MIRAGE_TOWER_4F 388
-#define LAYOUT_DESERT_UNDERPASS 389
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM 390
-#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR 391
-#define LAYOUT_ROUTE111_NO_MIRAGE_TOWER 392
-#define LAYOUT_UNION_ROOM 393
-#define LAYOUT_SAFARI_ZONE_NORTHEAST 394
-#define LAYOUT_SAFARI_ZONE_SOUTHEAST 395
-#define LAYOUT_BATTLE_FRONTIER_RANKING_HALL 396
-#define LAYOUT_BATTLE_FRONTIER_LOUNGE1 397
-#define LAYOUT_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER 398
-#define LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE 399
-#define LAYOUT_ARTISAN_CAVE_B1F 400
-#define LAYOUT_ARTISAN_CAVE_1F 401
-#define LAYOUT_FARAWAY_ISLAND_ENTRANCE 402
-#define LAYOUT_FARAWAY_ISLAND_INTERIOR 403
-#define LAYOUT_BIRTH_ISLAND_EXTERIOR 404
-#define LAYOUT_ISLAND_HARBOR 405
-#define LAYOUT_UNDERWATER_MARINE_CAVE 406
-#define LAYOUT_MARINE_CAVE_ENTRANCE 407
-#define LAYOUT_TERRA_CAVE_ENTRANCE 408
-#define LAYOUT_TERRA_CAVE_END 409
-#define LAYOUT_UNDERWATER_ROUTE105 410
-#define LAYOUT_UNDERWATER_ROUTE125 411
-#define LAYOUT_UNDERWATER_ROUTE129 412
-#define LAYOUT_MARINE_CAVE_END 413
-#define LAYOUT_TRAINER_HILL_ENTRANCE 414
-#define LAYOUT_TRAINER_HILL_1F 415
-#define LAYOUT_TRAINER_HILL_2F 416
-#define LAYOUT_TRAINER_HILL_3F 417
-#define LAYOUT_TRAINER_HILL_4F 418
-#define LAYOUT_TRAINER_HILL_ROOF 419
-#define LAYOUT_ALTERING_CAVE 420
-#define LAYOUT_NAVEL_ROCK_EXTERIOR 421
-#define LAYOUT_NAVEL_ROCK_ENTRANCE 422
-#define LAYOUT_NAVEL_ROCK_TOP 423
-#define LAYOUT_NAVEL_ROCK_BOTTOM 424
-#define LAYOUT_NAVEL_ROCK_LADDER_ROOM1 425
-#define LAYOUT_NAVEL_ROCK_LADDER_ROOM2 426
-#define LAYOUT_NAVEL_ROCK_B1F 427
-#define LAYOUT_NAVEL_ROCK_FORK 428
-#define LAYOUT_BATTLE_FRONTIER_LOUNGE2 429
-#define LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE 430
-#define LAYOUT_METEOR_FALLS_STEVENS_CAVE 431
-#define LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE 432
-#define LAYOUT_SKY_PILLAR_1F_CLEAN 433
-#define LAYOUT_SKY_PILLAR_2F_CLEAN 434
-#define LAYOUT_SKY_PILLAR_3F_CLEAN 435
-#define LAYOUT_SKY_PILLAR_4F_CLEAN 436
-#define LAYOUT_SKY_PILLAR_5F_CLEAN 437
-#define LAYOUT_SKY_PILLAR_TOP_CLEAN 438
-#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439
-#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440
-#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED 441
-
-#endif // GUARD_CONSTANTS_LAYOUTS_H
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -1,596 +0,0 @@
-#ifndef GUARD_CONSTANTS_MAP_GROUPS_H
-#define GUARD_CONSTANTS_MAP_GROUPS_H
-
-//
-// DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json
-//
-
-// gMapGroup_TownsAndRoutes
-#define MAP_PETALBURG_CITY      (0 | (0 << 8))
-#define MAP_SLATEPORT_CITY      (1 | (0 << 8))
-#define MAP_MAUVILLE_CITY       (2 | (0 << 8))
-#define MAP_RUSTBORO_CITY       (3 | (0 << 8))
-#define MAP_FORTREE_CITY        (4 | (0 << 8))
-#define MAP_LILYCOVE_CITY       (5 | (0 << 8))
-#define MAP_MOSSDEEP_CITY       (6 | (0 << 8))
-#define MAP_SOOTOPOLIS_CITY     (7 | (0 << 8))
-#define MAP_EVER_GRANDE_CITY    (8 | (0 << 8))
-#define MAP_LITTLEROOT_TOWN     (9 | (0 << 8))
-#define MAP_OLDALE_TOWN         (10 | (0 << 8))
-#define MAP_DEWFORD_TOWN        (11 | (0 << 8))
-#define MAP_LAVARIDGE_TOWN      (12 | (0 << 8))
-#define MAP_FALLARBOR_TOWN      (13 | (0 << 8))
-#define MAP_VERDANTURF_TOWN     (14 | (0 << 8))
-#define MAP_PACIFIDLOG_TOWN     (15 | (0 << 8))
-#define MAP_ROUTE101            (16 | (0 << 8))
-#define MAP_ROUTE102            (17 | (0 << 8))
-#define MAP_ROUTE103            (18 | (0 << 8))
-#define MAP_ROUTE104            (19 | (0 << 8))
-#define MAP_ROUTE105            (20 | (0 << 8))
-#define MAP_ROUTE106            (21 | (0 << 8))
-#define MAP_ROUTE107            (22 | (0 << 8))
-#define MAP_ROUTE108            (23 | (0 << 8))
-#define MAP_ROUTE109            (24 | (0 << 8))
-#define MAP_ROUTE110            (25 | (0 << 8))
-#define MAP_ROUTE111            (26 | (0 << 8))
-#define MAP_ROUTE112            (27 | (0 << 8))
-#define MAP_ROUTE113            (28 | (0 << 8))
-#define MAP_ROUTE114            (29 | (0 << 8))
-#define MAP_ROUTE115            (30 | (0 << 8))
-#define MAP_ROUTE116            (31 | (0 << 8))
-#define MAP_ROUTE117            (32 | (0 << 8))
-#define MAP_ROUTE118            (33 | (0 << 8))
-#define MAP_ROUTE119            (34 | (0 << 8))
-#define MAP_ROUTE120            (35 | (0 << 8))
-#define MAP_ROUTE121            (36 | (0 << 8))
-#define MAP_ROUTE122            (37 | (0 << 8))
-#define MAP_ROUTE123            (38 | (0 << 8))
-#define MAP_ROUTE124            (39 | (0 << 8))
-#define MAP_ROUTE125            (40 | (0 << 8))
-#define MAP_ROUTE126            (41 | (0 << 8))
-#define MAP_ROUTE127            (42 | (0 << 8))
-#define MAP_ROUTE128            (43 | (0 << 8))
-#define MAP_ROUTE129            (44 | (0 << 8))
-#define MAP_ROUTE130            (45 | (0 << 8))
-#define MAP_ROUTE131            (46 | (0 << 8))
-#define MAP_ROUTE132            (47 | (0 << 8))
-#define MAP_ROUTE133            (48 | (0 << 8))
-#define MAP_ROUTE134            (49 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE124 (50 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE126 (51 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE127 (52 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE128 (53 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE129 (54 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE105 (55 | (0 << 8))
-#define MAP_UNDERWATER_ROUTE125 (56 | (0 << 8))
-
-// gMapGroup_IndoorLittleroot
-#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F    (0 | (1 << 8))
-#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F    (1 | (1 << 8))
-#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F        (2 | (1 << 8))
-#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F        (3 | (1 << 8))
-#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (1 << 8))
-
-// gMapGroup_IndoorOldale
-#define MAP_OLDALE_TOWN_HOUSE1            (0 | (2 << 8))
-#define MAP_OLDALE_TOWN_HOUSE2            (1 | (2 << 8))
-#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (2 << 8))
-#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (2 << 8))
-#define MAP_OLDALE_TOWN_MART              (4 | (2 << 8))
-
-// gMapGroup_IndoorDewford
-#define MAP_DEWFORD_TOWN_HOUSE1            (0 | (3 << 8))
-#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (3 << 8))
-#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (3 << 8))
-#define MAP_DEWFORD_TOWN_GYM               (3 | (3 << 8))
-#define MAP_DEWFORD_TOWN_HALL              (4 | (3 << 8))
-#define MAP_DEWFORD_TOWN_HOUSE2            (5 | (3 << 8))
-
-// gMapGroup_IndoorLavaridge
-#define MAP_LAVARIDGE_TOWN_HERB_SHOP         (0 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_GYM_1F            (1 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_GYM_B1F           (2 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_HOUSE             (3 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_MART              (4 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8))
-#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8))
-
-// gMapGroup_IndoorFallarbor
-#define MAP_FALLARBOR_TOWN_MART                    (0 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY       (1 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR    (2 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F       (4 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F       (5 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_COZMOS_HOUSE            (6 | (5 << 8))
-#define MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE   (7 | (5 << 8))
-
-// gMapGroup_IndoorVerdanturf
-#define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY       (0 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR    (1 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM (2 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_MART                    (3 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F       (4 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F       (5 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE            (6 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (7 | (6 << 8))
-#define MAP_VERDANTURF_TOWN_HOUSE                   (8 | (6 << 8))
-
-// gMapGroup_IndoorPacifidlog
-#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE1            (2 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE2            (3 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE3            (4 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE4            (5 | (7 << 8))
-#define MAP_PACIFIDLOG_TOWN_HOUSE5            (6 | (7 << 8))
-
-// gMapGroup_IndoorPetalburg
-#define MAP_PETALBURG_CITY_WALLYS_HOUSE      (0 | (8 << 8))
-#define MAP_PETALBURG_CITY_GYM               (1 | (8 << 8))
-#define MAP_PETALBURG_CITY_HOUSE1            (2 | (8 << 8))
-#define MAP_PETALBURG_CITY_HOUSE2            (3 | (8 << 8))
-#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8))
-#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8))
-#define MAP_PETALBURG_CITY_MART              (6 | (8 << 8))
-
-// gMapGroup_IndoorSlateport
-#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F      (0 | (9 << 8))
-#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F      (1 | (9 << 8))
-#define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY       (2 | (9 << 8))
-#define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR    (3 | (9 << 8))
-#define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8))
-#define MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE       (5 | (9 << 8))
-#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB        (6 | (9 << 8))
-#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F       (7 | (9 << 8))
-#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F       (8 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HARBOR                  (9 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HOUSE                   (10 | (9 << 8))
-#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F       (11 | (9 << 8))
-#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F       (12 | (9 << 8))
-#define MAP_SLATEPORT_CITY_MART                    (13 | (9 << 8))
-
-// gMapGroup_IndoorMauville
-#define MAP_MAUVILLE_CITY_GYM               (0 | (10 << 8))
-#define MAP_MAUVILLE_CITY_BIKE_SHOP         (1 | (10 << 8))
-#define MAP_MAUVILLE_CITY_HOUSE1            (2 | (10 << 8))
-#define MAP_MAUVILLE_CITY_GAME_CORNER       (3 | (10 << 8))
-#define MAP_MAUVILLE_CITY_HOUSE2            (4 | (10 << 8))
-#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8))
-#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8))
-#define MAP_MAUVILLE_CITY_MART              (7 | (10 << 8))
-
-// gMapGroup_IndoorRustboro
-#define MAP_RUSTBORO_CITY_DEVON_CORP_1F     (0 | (11 << 8))
-#define MAP_RUSTBORO_CITY_DEVON_CORP_2F     (1 | (11 << 8))
-#define MAP_RUSTBORO_CITY_DEVON_CORP_3F     (2 | (11 << 8))
-#define MAP_RUSTBORO_CITY_GYM               (3 | (11 << 8))
-#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL    (4 | (11 << 8))
-#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8))
-#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8))
-#define MAP_RUSTBORO_CITY_MART              (7 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT1_1F          (8 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT1_2F          (9 | (11 << 8))
-#define MAP_RUSTBORO_CITY_HOUSE1            (10 | (11 << 8))
-#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE     (11 | (11 << 8))
-#define MAP_RUSTBORO_CITY_HOUSE2            (12 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT2_1F          (13 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT2_2F          (14 | (11 << 8))
-#define MAP_RUSTBORO_CITY_FLAT2_3F          (15 | (11 << 8))
-#define MAP_RUSTBORO_CITY_HOUSE3            (16 | (11 << 8))
-
-// gMapGroup_IndoorFortree
-#define MAP_FORTREE_CITY_HOUSE1            (0 | (12 << 8))
-#define MAP_FORTREE_CITY_GYM               (1 | (12 << 8))
-#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (12 << 8))
-#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8))
-#define MAP_FORTREE_CITY_MART              (4 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE2            (5 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE3            (6 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE4            (7 | (12 << 8))
-#define MAP_FORTREE_CITY_HOUSE5            (8 | (12 << 8))
-#define MAP_FORTREE_CITY_DECORATION_SHOP   (9 | (12 << 8))
-
-// gMapGroup_IndoorLilycove
-#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F        (0 | (13 << 8))
-#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F        (1 | (13 << 8))
-#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F        (2 | (13 << 8))
-#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F        (3 | (13 << 8))
-#define MAP_LILYCOVE_CITY_CONTEST_LOBBY             (4 | (13 << 8))
-#define MAP_LILYCOVE_CITY_CONTEST_HALL              (5 | (13 << 8))
-#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F         (6 | (13 << 8))
-#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F         (7 | (13 << 8))
-#define MAP_LILYCOVE_CITY_UNUSED_MART               (8 | (13 << 8))
-#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB  (9 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HARBOR                    (10 | (13 << 8))
-#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE       (11 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE1                    (12 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE2                    (13 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE3                    (14 | (13 << 8))
-#define MAP_LILYCOVE_CITY_HOUSE4                    (15 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F       (16 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F       (17 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F       (18 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F       (19 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F       (20 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP  (21 | (13 << 8))
-#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (22 | (13 << 8))
-
-// gMapGroup_IndoorMossdeep
-#define MAP_MOSSDEEP_CITY_GYM               (0 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE1            (1 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE2            (2 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_MART              (5 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE3            (6 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE     (7 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_HOUSE4            (8 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F   (9 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F   (10 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F    (11 | (14 << 8))
-#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F   (12 | (14 << 8))
-
-// gMapGroup_IndoorSootopolis
-#define MAP_SOOTOPOLIS_CITY_GYM_1F                   (0 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_GYM_B1F                  (1 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F        (2 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F        (3 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_MART                     (4 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE1                   (5 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE2                   (6 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE3                   (7 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE4                   (8 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE5                   (9 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE6                   (10 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_HOUSE7                   (11 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE   (12 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F  (13 | (15 << 8))
-#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8))
-
-// gMapGroup_IndoorEverGrande
-#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM      (0 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM      (1 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM      (2 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM       (3 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM    (4 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL1             (5 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL2             (6 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL3             (7 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL4             (8 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL5             (9 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME      (11 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (16 << 8))
-#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F (14 | (16 << 8))
-
-// gMapGroup_IndoorRoute104
-#define MAP_ROUTE104_MR_BRINEYS_HOUSE         (0 | (17 << 8))
-#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8))
-
-// gMapGroup_IndoorRoute111
-#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8))
-#define MAP_ROUTE111_OLD_LADYS_REST_STOP     (1 | (18 << 8))
-
-// gMapGroup_IndoorRoute112
-#define MAP_ROUTE112_CABLE_CAR_STATION   (0 | (19 << 8))
-#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8))
-
-// gMapGroup_IndoorRoute114
-#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE  (0 | (20 << 8))
-#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (20 << 8))
-#define MAP_ROUTE114_LANETTES_HOUSE        (2 | (20 << 8))
-
-// gMapGroup_IndoorRoute116
-#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8))
-
-// gMapGroup_IndoorRoute117
-#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8))
-
-// gMapGroup_IndoorRoute121
-#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8))
-
-// gMapGroup_Dungeons
-#define MAP_METEOR_FALLS_1F_1R                       (0 | (24 << 8))
-#define MAP_METEOR_FALLS_1F_2R                       (1 | (24 << 8))
-#define MAP_METEOR_FALLS_B1F_1R                      (2 | (24 << 8))
-#define MAP_METEOR_FALLS_B1F_2R                      (3 | (24 << 8))
-#define MAP_RUSTURF_TUNNEL                           (4 | (24 << 8))
-#define MAP_UNDERWATER_SOOTOPOLIS_CITY               (5 | (24 << 8))
-#define MAP_DESERT_RUINS                             (6 | (24 << 8))
-#define MAP_GRANITE_CAVE_1F                          (7 | (24 << 8))
-#define MAP_GRANITE_CAVE_B1F                         (8 | (24 << 8))
-#define MAP_GRANITE_CAVE_B2F                         (9 | (24 << 8))
-#define MAP_GRANITE_CAVE_STEVENS_ROOM                (10 | (24 << 8))
-#define MAP_PETALBURG_WOODS                          (11 | (24 << 8))
-#define MAP_MT_CHIMNEY                               (12 | (24 << 8))
-#define MAP_JAGGED_PASS                              (13 | (24 << 8))
-#define MAP_FIERY_PATH                               (14 | (24 << 8))
-#define MAP_MT_PYRE_1F                               (15 | (24 << 8))
-#define MAP_MT_PYRE_2F                               (16 | (24 << 8))
-#define MAP_MT_PYRE_3F                               (17 | (24 << 8))
-#define MAP_MT_PYRE_4F                               (18 | (24 << 8))
-#define MAP_MT_PYRE_5F                               (19 | (24 << 8))
-#define MAP_MT_PYRE_6F                               (20 | (24 << 8))
-#define MAP_MT_PYRE_EXTERIOR                         (21 | (24 << 8))
-#define MAP_MT_PYRE_SUMMIT                           (22 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_1F                          (23 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_B1F                         (24 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_B2F                         (25 | (24 << 8))
-#define MAP_UNDERWATER_SEAFLOOR_CAVERN               (26 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ENTRANCE                 (27 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM1                    (28 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM2                    (29 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM3                    (30 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM4                    (31 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM5                    (32 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM6                    (33 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM7                    (34 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM8                    (35 | (24 << 8))
-#define MAP_SEAFLOOR_CAVERN_ROOM9                    (36 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_ENTRANCE                  (37 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_1F                        (38 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (24 << 8))
-#define MAP_CAVE_OF_ORIGIN_B1F                       (42 | (24 << 8))
-#define MAP_VICTORY_ROAD_1F                          (43 | (24 << 8))
-#define MAP_VICTORY_ROAD_B1F                         (44 | (24 << 8))
-#define MAP_VICTORY_ROAD_B2F                         (45 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM        (46 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM           (47 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM          (48 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM           (49 | (24 << 8))
-#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM       (50 | (24 << 8))
-#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM          (51 | (24 << 8))
-#define MAP_NEW_MAUVILLE_ENTRANCE                    (52 | (24 << 8))
-#define MAP_NEW_MAUVILLE_INSIDE                      (53 | (24 << 8))
-#define MAP_ABANDONED_SHIP_DECK                      (54 | (24 << 8))
-#define MAP_ABANDONED_SHIP_CORRIDORS_1F              (55 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS_1F                  (56 | (24 << 8))
-#define MAP_ABANDONED_SHIP_CORRIDORS_B1F             (57 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS_B1F                 (58 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS2_B1F                (59 | (24 << 8))
-#define MAP_ABANDONED_SHIP_UNDERWATER1               (60 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOM_B1F                  (61 | (24 << 8))
-#define MAP_ABANDONED_SHIP_ROOMS2_1F                 (62 | (24 << 8))
-#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE           (63 | (24 << 8))
-#define MAP_ABANDONED_SHIP_UNDERWATER2               (64 | (24 << 8))
-#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS    (65 | (24 << 8))
-#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS        (66 | (24 << 8))
-#define MAP_ISLAND_CAVE                              (67 | (24 << 8))
-#define MAP_ANCIENT_TOMB                             (68 | (24 << 8))
-#define MAP_UNDERWATER_ROUTE134                      (69 | (24 << 8))
-#define MAP_UNDERWATER_SEALED_CHAMBER                (70 | (24 << 8))
-#define MAP_SEALED_CHAMBER_OUTER_ROOM                (71 | (24 << 8))
-#define MAP_SEALED_CHAMBER_INNER_ROOM                (72 | (24 << 8))
-#define MAP_SCORCHED_SLAB                            (73 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1            (74 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2            (75 | (24 << 8))
-#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3            (76 | (24 << 8))
-#define MAP_SKY_PILLAR_ENTRANCE                      (77 | (24 << 8))
-#define MAP_SKY_PILLAR_OUTSIDE                       (78 | (24 << 8))
-#define MAP_SKY_PILLAR_1F                            (79 | (24 << 8))
-#define MAP_SKY_PILLAR_2F                            (80 | (24 << 8))
-#define MAP_SKY_PILLAR_3F                            (81 | (24 << 8))
-#define MAP_SKY_PILLAR_4F                            (82 | (24 << 8))
-#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM             (83 | (24 << 8))
-#define MAP_SKY_PILLAR_5F                            (84 | (24 << 8))
-#define MAP_SKY_PILLAR_TOP                           (85 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_1F                         (86 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_2F_1R                      (87 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_2F_2R                      (88 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_3F_1R                      (89 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_3F_2R                      (90 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_4F                         (91 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_3F_3R                      (92 | (24 << 8))
-#define MAP_MAGMA_HIDEOUT_2F_3R                      (93 | (24 << 8))
-#define MAP_MIRAGE_TOWER_1F                          (94 | (24 << 8))
-#define MAP_MIRAGE_TOWER_2F                          (95 | (24 << 8))
-#define MAP_MIRAGE_TOWER_3F                          (96 | (24 << 8))
-#define MAP_MIRAGE_TOWER_4F                          (97 | (24 << 8))
-#define MAP_DESERT_UNDERPASS                         (98 | (24 << 8))
-#define MAP_ARTISAN_CAVE_B1F                         (99 | (24 << 8))
-#define MAP_ARTISAN_CAVE_1F                          (100 | (24 << 8))
-#define MAP_UNDERWATER_MARINE_CAVE                   (101 | (24 << 8))
-#define MAP_MARINE_CAVE_ENTRANCE                     (102 | (24 << 8))
-#define MAP_MARINE_CAVE_END                          (103 | (24 << 8))
-#define MAP_TERRA_CAVE_ENTRANCE                      (104 | (24 << 8))
-#define MAP_TERRA_CAVE_END                           (105 | (24 << 8))
-#define MAP_ALTERING_CAVE                            (106 | (24 << 8))
-#define MAP_METEOR_FALLS_STEVENS_CAVE                (107 | (24 << 8))
-
-// gMapGroup_IndoorDynamic
-#define MAP_SECRET_BASE_RED_CAVE1    (0 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE1  (1 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE1   (2 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8))
-#define MAP_SECRET_BASE_TREE1        (4 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB1       (5 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE2    (6 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE2  (7 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE2   (8 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8))
-#define MAP_SECRET_BASE_TREE2        (10 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB2       (11 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE3    (12 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE3  (13 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE3   (14 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8))
-#define MAP_SECRET_BASE_TREE3        (16 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB3       (17 | (25 << 8))
-#define MAP_SECRET_BASE_RED_CAVE4    (18 | (25 << 8))
-#define MAP_SECRET_BASE_BROWN_CAVE4  (19 | (25 << 8))
-#define MAP_SECRET_BASE_BLUE_CAVE4   (20 | (25 << 8))
-#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8))
-#define MAP_SECRET_BASE_TREE4        (22 | (25 << 8))
-#define MAP_SECRET_BASE_SHRUB4       (23 | (25 << 8))
-#define MAP_BATTLE_COLOSSEUM_2P      (24 | (25 << 8))
-#define MAP_TRADE_CENTER             (25 | (25 << 8))
-#define MAP_RECORD_CORNER            (26 | (25 << 8))
-#define MAP_BATTLE_COLOSSEUM_4P      (27 | (25 << 8))
-#define MAP_CONTEST_HALL             (28 | (25 << 8))
-#define MAP_UNUSED_CONTEST_HALL1     (29 | (25 << 8))
-#define MAP_UNUSED_CONTEST_HALL2     (30 | (25 << 8))
-#define MAP_UNUSED_CONTEST_HALL3     (31 | (25 << 8))
-#define MAP_UNUSED_CONTEST_HALL4     (32 | (25 << 8))
-#define MAP_UNUSED_CONTEST_HALL5     (33 | (25 << 8))
-#define MAP_UNUSED_CONTEST_HALL6     (34 | (25 << 8))
-#define MAP_CONTEST_HALL_BEAUTY      (35 | (25 << 8))
-#define MAP_CONTEST_HALL_TOUGH       (36 | (25 << 8))
-#define MAP_CONTEST_HALL_COOL        (37 | (25 << 8))
-#define MAP_CONTEST_HALL_SMART       (38 | (25 << 8))
-#define MAP_CONTEST_HALL_CUTE        (39 | (25 << 8))
-#define MAP_INSIDE_OF_TRUCK          (40 | (25 << 8))
-#define MAP_SS_TIDAL_CORRIDOR        (41 | (25 << 8))
-#define MAP_SS_TIDAL_LOWER_DECK      (42 | (25 << 8))
-#define MAP_SS_TIDAL_ROOMS           (43 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE01  (44 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE02  (45 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE03  (46 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE04  (47 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE05  (48 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE06  (49 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE07  (50 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE08  (51 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE09  (52 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE10  (53 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE11  (54 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE12  (55 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE13  (56 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE14  (57 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE15  (58 | (25 << 8))
-#define MAP_BATTLE_PYRAMID_SQUARE16  (59 | (25 << 8))
-#define MAP_UNION_ROOM               (60 | (25 << 8))
-
-// gMapGroup_SpecialArea
-#define MAP_SAFARI_ZONE_NORTHWEST                           (0 | (26 << 8))
-#define MAP_SAFARI_ZONE_NORTH                               (1 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHWEST                           (2 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTH                               (3 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST                    (4 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY              (5 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR           (6 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR           (7 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM        (8 | (26 << 8))
-#define MAP_SOUTHERN_ISLAND_EXTERIOR                        (9 | (26 << 8))
-#define MAP_SOUTHERN_ISLAND_INTERIOR                        (10 | (26 << 8))
-#define MAP_SAFARI_ZONE_REST_HOUSE                          (11 | (26 << 8))
-#define MAP_SAFARI_ZONE_NORTHEAST                           (12 | (26 << 8))
-#define MAP_SAFARI_ZONE_SOUTHEAST                           (13 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST                    (14 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM (15 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR     (16 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM  (17 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY               (18 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR            (19 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM     (20 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM         (21 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY             (22 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR          (23 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM       (24 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY            (25 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR            (26 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP              (27 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY              (28 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR           (29 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM        (30 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY            (31 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM  (32 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM      (33 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY               (34 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR            (35 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM     (36 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL         (37 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL          (38 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS      (39 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_RANKING_HALL                    (40 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE1                         (41 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER         (42 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE2                         (43 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE3                         (44 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE4                         (45 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE                    (46 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE5                         (47 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE6                         (48 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE7                         (49 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_RECEPTION_GATE                  (50 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE8                         (51 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_LOUNGE9                         (52 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F               (53 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F               (54 | (26 << 8))
-#define MAP_BATTLE_FRONTIER_MART                            (55 | (26 << 8))
-#define MAP_FARAWAY_ISLAND_ENTRANCE                         (56 | (26 << 8))
-#define MAP_FARAWAY_ISLAND_INTERIOR                         (57 | (26 << 8))
-#define MAP_BIRTH_ISLAND_EXTERIOR                           (58 | (26 << 8))
-#define MAP_BIRTH_ISLAND_HARBOR                             (59 | (26 << 8))
-#define MAP_TRAINER_HILL_ENTRANCE                           (60 | (26 << 8))
-#define MAP_TRAINER_HILL_1F                                 (61 | (26 << 8))
-#define MAP_TRAINER_HILL_2F                                 (62 | (26 << 8))
-#define MAP_TRAINER_HILL_3F                                 (63 | (26 << 8))
-#define MAP_TRAINER_HILL_4F                                 (64 | (26 << 8))
-#define MAP_TRAINER_HILL_ROOF                               (65 | (26 << 8))
-#define MAP_NAVEL_ROCK_EXTERIOR                             (66 | (26 << 8))
-#define MAP_NAVEL_ROCK_HARBOR                               (67 | (26 << 8))
-#define MAP_NAVEL_ROCK_ENTRANCE                             (68 | (26 << 8))
-#define MAP_NAVEL_ROCK_B1F                                  (69 | (26 << 8))
-#define MAP_NAVEL_ROCK_FORK                                 (70 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP1                                  (71 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP2                                  (72 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP3                                  (73 | (26 << 8))
-#define MAP_NAVEL_ROCK_UP4                                  (74 | (26 << 8))
-#define MAP_NAVEL_ROCK_TOP                                  (75 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN01                               (76 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN02                               (77 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN03                               (78 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN04                               (79 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN05                               (80 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN06                               (81 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN07                               (82 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN08                               (83 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN09                               (84 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN10                               (85 | (26 << 8))
-#define MAP_NAVEL_ROCK_DOWN11                               (86 | (26 << 8))
-#define MAP_NAVEL_ROCK_BOTTOM                               (87 | (26 << 8))
-#define MAP_TRAINER_HILL_ELEVATOR                           (88 | (26 << 8))
-
-// gMapGroup_IndoorRoute104Prototype
-#define MAP_ROUTE104_PROTOTYPE                          (0 | (27 << 8))
-#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8))
-
-// gMapGroup_IndoorRoute109
-#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8))
-
-// gMapGroup_IndoorRoute110
-#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE                (0 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_END                     (1 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR                (2 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1                 (3 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2                 (4 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3                 (5 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4                 (6 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5                 (7 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6                 (8 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7                 (9 | (29 << 8))
-#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8                 (10 | (29 << 8))
-#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8))
-#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8))
-
-// gMapGroup_IndoorRoute113
-#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8))
-
-// gMapGroup_IndoorRoute123
-#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8))
-
-// gMapGroup_IndoorRoute119
-#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (32 << 8))
-#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (32 << 8))
-#define MAP_ROUTE119_HOUSE                (2 | (32 << 8))
-
-// gMapGroup_IndoorRoute124
-#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8))
-
-#define MAP_GROUPS_COUNT 34
-
-#endif // GUARD_CONSTANTS_MAP_GROUPS_H
--- a/include/dma3.h
+++ b/include/dma3.h
--- a/include/gpu_regs.h
+++ b/include/gpu_regs.h
--- a/include/io_reg.h
+++ b/include/io_reg.h
--- a/include/malloc.h
+++ b/include/malloc.h
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -24,7 +24,6 @@ void SetCurSecretBaseIdFromPosition(const struct MapPosition *position, const st
 void TrySetCurSecretBaseIndex(void);
 void CheckPlayerHasSecretBase(void);
 void ToggleSecretBaseEntranceMetatile(void);
-void ScriptContext_Enable(void);
 void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx);

 #endif //GUARD_SECRET_BASE_H
--- a/include/sprite.h
+++ b/include/sprite.h
--- a/include/string_util.h
+++ b/include/string_util.h
--- a/include/text.h
+++ b/include/text.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_TEXT_H
 #define GUARD_TEXT_H

-#include "characters.h"
+#include "constants/characters.h"

 // Given as a text speed when all the text should be
 // loaded at once but not copied to vram yet.
--- a/include/window.h
+++ b/include/window.h
--- a/ld_script.ld
+++ b/ld_script.ld
@@ -23,7 +23,6 @@ SECTIONS {
    {
        INCLUDE "sym_ewram.ld"
        src/*.o(ewram_data);
-        gflib/*.o(ewram_data);

        *libc.a:impure.o(.data);
        *libc.a:locale.o(.data);
@@ -36,7 +35,6 @@ SECTIONS {
        /* .bss starts at 0x3000000 */
        INCLUDE "sym_bss.ld"
        src/*.o(.bss);
-        gflib/*.o(.bss);
        data/*.o(.bss);

        /* .bss.code starts at 0x3001AA8 */
@@ -57,15 +55,15 @@ SECTIONS {
        src/rom_header_gf.o(.text.*);
        src/crt0.o(.text);
        src/main.o(.text);
-        gflib/malloc.o(.text);
-        gflib/dma3_manager.o(.text);
-        gflib/gpu_regs.o(.text);
-        gflib/bg.o(.text);
-        gflib/blit.o(.text);
-        gflib/window.o(.text);
-        gflib/text.o(.text);
-        gflib/sprite.o(.text);
-        gflib/string_util.o(.text);
+        src/malloc.o(.text);
+        src/dma3_manager.o(.text);
+        src/gpu_regs.o(.text);
+        src/bg.o(.text);
+        src/blit.o(.text);
+        src/window.o(.text);
+        src/text.o(.text);
+        src/sprite.o(.text);
+        src/string_util.o(.text);
        src/link.o(.text);
        src/AgbRfu_LinkManager.o(.text);
        src/link_rfu_3.o(.text);
@@ -446,12 +444,12 @@ SECTIONS {
        src/rom_header.o(.rodata);
        src/rom_header_gf.o(.rodata);
        src/main.o(.rodata);
-        gflib/bg.o(.rodata);
-        gflib/window.o(.rodata);
-        gflib/text.o(.rodata);
-        gflib/sprite.o(.rodata);
-        gflib/io_reg.o(.rodata);
-        gflib/string_util.o(.rodata);
+        src/bg.o(.rodata);
+        src/window.o(.rodata);
+        src/text.o(.rodata);
+        src/sprite.o(.rodata);
+        src/io_reg.o(.rodata);
+        src/string_util.o(.rodata);
        src/link.o(.rodata);
        src/link.o(.rodata.str1.4);
        src/AgbRfu_LinkManager.o(.rodata);
@@ -1317,9 +1315,7 @@ SECTIONS {
    ALIGN(4)
    {
        src/*.o(.text);
-        gflib/*.o(.text);
        src/*.o(.rodata);
-        gflib/*.o(.rodata);
        data/*.o(.rodata);
    } > ROM = 0

--- a/ld_script_modern.ld
+++ b/ld_script_modern.ld
@@ -16,14 +16,12 @@ SECTIONS {
    ALIGN(4)
    {
        src/*.o(ewram_data);
-        gflib/*.o(ewram_data);
    } > EWRAM

    iwram 0x3000000 (NOLOAD) :
    ALIGN(4)
    {
        src/*.o(.bss);
-        gflib/*.o(.bss);
        data/*.o(.bss);
        *libc.a:*.o(.bss*);
        *libnosys.a:*.o(.bss*);
@@ -31,7 +29,6 @@ SECTIONS {
        src/m4a.o(.bss.code);

        src/*.o(COMMON);
-        gflib/*.o(COMMON);
        *libc.a:*.o(COMMON);
        *libnosys.a:*.o(COMMON);
    } > IWRAM
@@ -46,7 +43,6 @@ SECTIONS {
        src/rom_header_gf.o(.text.*);
        src/crt0.o(.text);
        src/main.o(.text);
-        gflib/*.o(.text*);
        src/*.o(.text*);
        asm/*.o(.text*);
    } > ROM =0
@@ -82,7 +78,6 @@ SECTIONS {
    ALIGN(4)
    {
        src/*.o(.rodata*);
-        gflib/*.o(.rodata*);
        data/*.o(.rodata*);
    } > ROM =0

--- a/make_tools.mk
+++ b/make_tools.mk
@@ -1,12 +1,22 @@
+# This controls building executables in the `tools` folder.
+# Can be invoked through the `Makefile` or standalone.

 MAKEFLAGS += --no-print-directory

 # Inclusive list. If you don't want a tool to be built, don't add it here.
-TOOLDIRS := tools/aif2pcm tools/bin2c tools/gbafix tools/gbagfx tools/jsonproc tools/mapjson tools/mid2agb tools/preproc tools/ramscrgen tools/rsfont tools/scaninc
+TOOLS_DIR := tools
+TOOL_NAMES := aif2pcm bin2c gbafix gbagfx jsonproc mapjson mid2agb preproc ramscrgen rsfont scaninc

-.PHONY: all $(TOOLDIRS)
+TOOLDIRS := $(TOOL_NAMES:%=$(TOOLS_DIR)/%)

-all: $(TOOLDIRS)
+# Tool making doesnt require a pokeemerald dependency scan.
+RULES_NO_SCAN += tools check-tools clean-tools $(TOOLDIRS)
+.PHONY: $(RULES_NO_SCAN)
+
+tools: $(TOOLDIRS)

 $(TOOLDIRS):
 	@$(MAKE) -C $@
+
+clean-tools:
+	@$(foreach tooldir,$(TOOLDIRS),$(MAKE) clean -C $(tooldir);)
--- a/map_data_rules.mk
+++ b/map_data_rules.mk
@@ -1,8 +1,17 @@
 # Map JSON data

+# Inputs
 MAPS_DIR = $(DATA_ASM_SUBDIR)/maps
 LAYOUTS_DIR = $(DATA_ASM_SUBDIR)/layouts

+# Outputs
+MAPS_OUTDIR := $(MAPS_DIR)
+LAYOUTS_OUTDIR := $(LAYOUTS_DIR)
+INCLUDECONSTS_OUTDIR := include/constants
+
+AUTO_GEN_TARGETS += $(INCLUDECONSTS_OUTDIR)/map_groups.h
+AUTO_GEN_TARGETS += $(INCLUDECONSTS_OUTDIR)/layouts.h
+
 MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/map.json))
 MAP_CONNECTIONS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/connections.inc,$(MAP_DIRS))
 MAP_EVENTS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/events.inc,$(MAP_DIRS))
@@ -13,19 +22,12 @@ $(DATA_ASM_BUILDDIR)/maps.o: $(DATA_ASM_SUBDIR)/maps.s $(LAYOUTS_DIR)/layouts.in
 $(DATA_ASM_BUILDDIR)/map_events.o: $(DATA_ASM_SUBDIR)/map_events.s $(MAPS_DIR)/events.inc $(MAP_EVENTS)
 	$(PREPROC) $< charmap.txt | $(CPP) -I include - | $(PREPROC) -ie $< charmap.txt | $(AS) $(ASFLAGS) -o $@

-$(MAPS_DIR)/%/header.inc: $(MAPS_DIR)/%/map.json
-	$(MAPJSON) map emerald $< $(LAYOUTS_DIR)/layouts.json
-$(MAPS_DIR)/%/events.inc: $(MAPS_DIR)/%/header.inc ;
-$(MAPS_DIR)/%/connections.inc: $(MAPS_DIR)/%/events.inc ;

-$(MAPS_DIR)/groups.inc: $(MAPS_DIR)/map_groups.json
-	$(MAPJSON) groups emerald $<
-$(MAPS_DIR)/connections.inc: $(MAPS_DIR)/groups.inc ;
-$(MAPS_DIR)/events.inc: $(MAPS_DIR)/connections.inc ;
-$(MAPS_DIR)/headers.inc: $(MAPS_DIR)/events.inc ;
-include/constants/map_groups.h: $(MAPS_DIR)/headers.inc ;
+$(MAPS_OUTDIR)/%/header.inc $(MAPS_OUTDIR)/%/events.inc $(MAPS_OUTDIR)/%/connections.inc: $(MAPS_DIR)/%/map.json
+	$(MAPJSON) map emerald $< $(LAYOUTS_DIR)/layouts.json $(@D)

-$(LAYOUTS_DIR)/layouts.inc: $(LAYOUTS_DIR)/layouts.json
-	$(MAPJSON) layouts emerald $<
-$(LAYOUTS_DIR)/layouts_table.inc: $(LAYOUTS_DIR)/layouts.inc ;
-include/constants/layouts.h: $(LAYOUTS_DIR)/layouts_table.inc ;
+$(MAPS_OUTDIR)/connections.inc $(MAPS_OUTDIR)/groups.inc $(MAPS_OUTDIR)/events.inc $(MAPS_OUTDIR)/headers.inc $(INCLUDECONSTS_OUTDIR)/map_groups.h: $(MAPS_DIR)/map_groups.json
+	$(MAPJSON) groups emerald $< $(MAPS_OUTDIR) $(INCLUDECONSTS_OUTDIR)
+
+$(LAYOUTS_OUTDIR)/layouts.inc $(LAYOUTS_OUTDIR)/layouts_table.inc $(INCLUDECONSTS_OUTDIR)/layouts.h: $(LAYOUTS_DIR)/layouts.json
+	$(MAPJSON) layouts emerald $< $(LAYOUTS_OUTDIR) $(INCLUDECONSTS_OUTDIR)
--- a/songs.mk
+++ b/songs.mk
--- a/sound/songs/midi/midi.cfg
+++ b/sound/songs/midi/midi.cfg
@@ -0,0 +1,420 @@
+mus_abandoned_ship.mid:        -E -R50 -G030 -V080
+mus_abnormal_weather.mid:      -E -R50 -G089 -V080
+mus_aqua_magma_hideout.mid:    -E -R50 -G076 -V084
+mus_awaken_legend.mid:         -E -R50 -G012 -V090 -P5
+mus_b_arena.mid:               -E -R50 -G104 -V090
+mus_b_dome_lobby.mid:          -E -R50 -G111 -V056
+mus_b_dome.mid:                -E -R50 -G111 -V090
+mus_b_factory.mid:             -E -R50 -G113 -V100
+mus_b_frontier.mid:            -E -R50 -G103 -V094
+mus_b_palace.mid:              -E -R50 -G108 -V105
+mus_b_pike.mid:                -E -R50 -G112 -V092
+mus_b_pyramid_top.mid:         -E -R50 -G107 -V077
+mus_b_pyramid.mid:             -E -R50 -G106 -V079
+mus_b_tower_rs.mid:            -E -R50 -G035 -V080
+mus_b_tower.mid:               -E -R50 -G110 -V100
+mus_birch_lab.mid:             -E -R50 -G033 -V080
+mus_c_comm_center.mid:         -E -R50 -V080
+mus_c_vs_legend_beast.mid:     -E -R50 -V080
+mus_cable_car.mid:             -E -R50 -G071 -V078
+mus_caught.mid:                -E -R50 -G025 -V080
+mus_cave_of_origin.mid:        -E -R50 -G037 -V080
+mus_contest_lobby.mid:         -E -R50 -G098 -V060
+mus_contest_results.mid:       -E -R50 -G092 -V080
+mus_contest_winner.mid:        -E -R50 -G085 -V100
+mus_contest.mid:               -E -R50 -G086 -V088
+mus_credits.mid:               -E -R50 -G101 -V100
+mus_cycling.mid:               -E -R50 -G049 -V083
+mus_dewford.mid:               -E -R50 -G073 -V078
+mus_dummy.mid:                 -E -R40
+mus_encounter_aqua.mid:        -E -R50 -G065 -V086
+mus_encounter_brendan.mid:     -E -R50 -G067 -V078
+mus_encounter_champion.mid:    -E -R50 -G100 -V076
+mus_encounter_cool.mid:        -E -R50 -G063 -V086
+mus_encounter_elite_four.mid:  -E -R50 -G096 -V078
+mus_encounter_female.mid:      -E -R50 -G053 -V072
+mus_encounter_girl.mid:        -E -R50 -G027 -V080
+mus_encounter_hiker.mid:       -E -R50 -G097 -V076
+mus_encounter_intense.mid:     -E -R50 -G062 -V078
+mus_encounter_interviewer.mid: -E -R50 -G099 -V062
+mus_encounter_magma.mid:       -E -R50 -G087 -V072
+mus_encounter_male.mid:        -E -R50 -G028 -V080
+mus_encounter_may.mid:         -E -R50 -G061 -V078
+mus_encounter_rich.mid:        -E -R50 -G043 -V094
+mus_encounter_suspicious.mid:  -E -R50 -G069 -V078
+mus_encounter_swimmer.mid:     -E -R50 -G036 -V080
+mus_encounter_twins.mid:       -E -R50 -G095 -V075
+mus_end.mid:                   -E -R50 -G102 -V036
+mus_ever_grande.mid:           -E -R50 -G068 -V086
+mus_evolution_intro.mid:       -E -R50 -G026 -V080
+mus_evolution.mid:             -E -R50 -G026 -V080
+mus_evolved.mid:               -E -R50 -G012 -V090 -P5
+mus_fallarbor.mid:             -E -R50 -G083 -V100
+mus_follow_me.mid:             -E -R50 -G066 -V074
+mus_fortree.mid:               -E -R50 -G032 -V080
+mus_game_corner.mid:           -E -R50 -G072 -V072
+mus_gsc_pewter.mid:            -E -R50 -V080
+mus_gsc_route38.mid:           -E -R50 -V080
+mus_gym.mid:                   -E -R50 -G013 -V080
+mus_hall_of_fame_room.mid:     -E -R50 -G093 -V080
+mus_hall_of_fame.mid:          -E -R50 -G082 -V078
+mus_heal.mid:                  -E -R50 -G012 -V090 -P5
+mus_help.mid:                  -E -R50 -G056 -V078
+mus_intro_battle.mid:          -E -R50 -G088 -V088
+mus_intro.mid:                 -E -R50 -G060 -V090
+mus_level_up.mid:              -E -R50 -G012 -V090 -P5
+mus_lilycove_museum.mid:       -E -R50 -G020 -V080
+mus_lilycove.mid:              -E -R50 -G054 -V085
+mus_link_contest_p1.mid:       -E -R50 -G039 -V079
+mus_link_contest_p2.mid:       -E -R50 -G040 -V090
+mus_link_contest_p3.mid:       -E -R50 -G041 -V075
+mus_link_contest_p4.mid:       -E -R50 -G042 -V090
+mus_littleroot_test.mid:       -E -R50 -G034 -V099
+mus_littleroot.mid:            -E -R50 -G051 -V100
+mus_move_deleted.mid:          -E -R50 -G012 -V090 -P5
+mus_mt_chimney.mid:            -E -R50 -G052 -V078
+mus_mt_pyre_exterior.mid:      -E -R50 -G080 -V080
+mus_mt_pyre.mid:               -E -R50 -G078 -V088
+mus_obtain_b_points.mid:       -E -R50 -G103 -V090 -P5
+mus_obtain_badge.mid:          -E -R50 -G012 -V090 -P5
+mus_obtain_berry.mid:          -E -R50 -G012 -V090 -P5
+mus_obtain_item.mid:           -E -R50 -G012 -V090 -P5
+mus_obtain_symbol.mid:         -E -R50 -G103 -V100 -P5
+mus_obtain_tmhm.mid:           -E -R50 -G012 -V090 -P5
+mus_oceanic_museum.mid:        -E -R50 -G023 -V080
+mus_oldale.mid:                -E -R50 -G019 -V080
+mus_petalburg_woods.mid:       -E -R50 -G018 -V080
+mus_petalburg.mid:             -E -R50 -G015 -V080
+mus_poke_center.mid:           -E -R50 -G046 -V092
+mus_poke_mart.mid:             -E -R50 -G050 -V085
+mus_rayquaza_appears.mid:      -E -R50 -G109 -V090
+mus_register_match_call.mid:   -E -R50 -G105 -V090 -P5
+mus_rg_berry_pick.mid:         -E -R50 -G132 -V090
+mus_rg_caught_intro.mid:       -E -R50 -G179 -V094 -P5
+mus_rg_caught.mid:             -E -R50 -G170 -V100
+mus_rg_celadon.mid:            -E -R50 -G168 -V070
+mus_rg_cinnabar.mid:           -E -R50 -G138 -V090
+mus_rg_credits.mid:            -E -R50 -G149 -V090
+mus_rg_cycling.mid:            -E -R50 -G141 -V090
+mus_rg_dex_rating.mid:         -E -R50 -G175 -V070 -P5
+mus_rg_encounter_boy.mid:      -E -R50 -G144 -V090
+mus_rg_encounter_deoxys.mid:   -E -R50 -G184 -V079
+mus_rg_encounter_girl.mid:     -E -R50 -G143 -V051
+mus_rg_encounter_gym_leader:   -E -R50 -G144 -V090
+mus_rg_encounter_rival.mid:    -E -R50 -G174 -V079
+mus_rg_encounter_rocket.mid:   -E -R50 -G142 -V096
+mus_rg_follow_me.mid:          -E -R50 -G131 -V068
+mus_rg_fuchsia.mid:            -E -R50 -G167 -V090
+mus_rg_game_corner.mid:        -E -R50 -G132 -V090
+mus_rg_game_freak.mid:         -E -R50 -G181 -V075
+mus_rg_gym.mid:                -E -R50 -G134 -V090
+mus_rg_hall_of_fame.mid:       -E -R50 -G145 -V079
+mus_rg_heal.mid:               -E -R50 -G140 -V090
+mus_rg_intro_fight.mid:        -E -R50 -G136 -V090
+mus_rg_jigglypuff.mid:         -E -R50 -G135 -V068 -P5
+mus_rg_lavender.mid:           -E -R50 -G139 -V090
+mus_rg_mt_moon.mid:            -E -R50 -G147 -V090
+mus_rg_mystery_gift.mid:       -E -R50 -G183 -V100
+mus_rg_net_center.mid:         -E -R50 -G162 -V096
+mus_rg_new_game_exit.mid:      -E -R50 -G182 -V088
+mus_rg_new_game_instruct.mid:  -E -R50 -G182 -V085
+mus_rg_new_game_intro.mid:     -E -R50 -G182 -V088
+mus_rg_oak_lab.mid:            -E -R50 -G160 -V075
+mus_rg_oak.mid:                -E -R50 -G161 -V086
+mus_rg_obtain_key_item.mid:    -E -R50 -G178 -V077 -P5
+mus_rg_pallet.mid:             -E -R50 -G159 -V100
+mus_rg_pewter.mid:             -E -R50 -G173 -V084
+mus_rg_photo.mid:              -E -R50 -G180 -V100 -P5
+mus_rg_poke_center.mid:        -E -R50 -G162 -V096
+mus_rg_poke_flute.mid:         -E -R50 -G165 -V048 -P5
+mus_rg_poke_jump.mid:          -E -R50 -G132 -V090
+mus_rg_poke_mansion.mid:       -E -R50 -G148 -V090
+mus_rg_poke_tower.mid:         -E -R50 -G165 -V090
+mus_rg_rival_exit.mid:         -E -R50 -G174 -V079
+mus_rg_rocket_hideout.mid:     -E -R50 -G133 -V090
+mus_rg_route1.mid:             -E -R50 -G150 -V079
+mus_rg_route3.mid:             -E -R50 -G152 -V083
+mus_rg_route11.mid:            -E -R50 -G153 -V090
+mus_rg_route24.mid:            -E -R50 -G151 -V086
+mus_rg_sevii_45.mid:           -E -R50 -G188 -V084
+mus_rg_sevii_67.mid:           -E -R50 -G189 -V084
+mus_rg_sevii_123.mid:          -E -R50 -G173 -V084
+mus_rg_sevii_cave.mid:         -E -R50 -G147 -V090
+mus_rg_sevii_dungeon.mid:      -E -R50 -G146 -V090
+mus_rg_sevii_route.mid:        -E -R50 -G187 -V080
+mus_rg_silph.mid:              -E -R50 -G166 -V076
+mus_rg_slow_pallet.mid:        -E -R50 -G159 -V092
+mus_rg_ss_anne.mid:            -E -R50 -G163 -V090
+mus_rg_surf.mid:               -E -R50 -G164 -V071
+mus_rg_teachy_tv_menu.mid:     -E -R50 -G186 -V059
+mus_rg_teachy_tv_show.mid:     -E -R50 -G131 -V068
+mus_rg_title.mid:              -E -R50 -G137 -V090
+mus_rg_trainer_tower.mid:      -E -R50 -G134 -V090
+mus_rg_union_room.mid:         -E -R50 -G132 -V090
+mus_rg_vermillion.mid:         -E -R50 -G172 -V090
+mus_rg_victory_gym_leader.mid: -E -R50 -G171 -V090
+mus_rg_victory_road.mid:       -E -R50 -G154 -V090
+mus_rg_victory_trainer.mid:    -E -R50 -G169 -V089
+mus_rg_victory_wild.mid:       -E -R50 -G170 -V090
+mus_rg_viridian_forest.mid:    -E -R50 -G146 -V090
+mus_rg_vs_champion.mid:        -E -R50 -G158 -V090
+mus_rg_vs_deoxys.mid:          -E -R50 -G185 -V080
+mus_rg_vs_gym_leader.mid:      -E -R50 -G155 -V090
+mus_rg_vs_legend.mid:          -E -R50 -G157 -V090
+mus_rg_vs_mewtwo.mid:          -E -R50 -G157 -V090
+mus_rg_vs_trainer.mid:         -E -R50 -G156 -V090
+mus_rg_vs_wild.mid:            -E -R50 -G157 -V090
+mus_roulette.mid:              -E -R50 -G038 -V080
+mus_route101.mid:              -E -R50 -G011 -V080
+mus_route104.mid:              -E -R50 -G047 -V097
+mus_route110.mid:              -E -R50 -G010 -V080
+mus_route111.mid:              -E -R50 -G055 -V076
+mus_route113.mid:              -E -R50 -G064 -V084
+mus_route119.mid:              -E -R50 -G048 -V096
+mus_route120.mid:              -E -R50 -G014 -V080
+mus_route122.mid:              -E -R50 -G021 -V080
+mus_rustboro.mid:              -E -R50 -G045 -V085
+mus_safari_zone.mid:           -E -R50 -G074 -V082
+mus_sailing.mid:               -E -R50 -G077 -V086
+mus_school.mid:                -E -R50 -G081 -V100
+mus_sealed_chamber.mid:        -E -R50 -G084 -V100
+mus_slateport.mid:             -E -R50 -G079 -V070
+mus_slots_jackpot.mid:         -E -R50 -G012 -V090 -P5
+mus_slots_win.mid:             -E -R50 -G012 -V090 -P5
+mus_sootopolis.mid:            -E -R50 -G091 -V062
+mus_surf.mid:                  -E -R50 -G017 -V080
+mus_title.mid:                 -E -R50 -G059 -V090
+mus_too_bad.mid:               -E -R50 -G012 -V090 -P5
+mus_trick_house.mid:           -E -R50 -G094 -V070
+mus_underwater.mid:            -E -R50 -G057 -V094
+mus_verdanturf.mid:            -E -R50 -G044 -V090
+mus_victory_aqua_magma.mid:    -E -R50 -G070 -V088
+mus_victory_gym_leader.mid:    -E -R50 -G024 -V080
+mus_victory_league.mid:        -E -R50 -G029 -V080
+mus_victory_road.mid:          -E -R50 -G075 -V076
+mus_victory_trainer.mid:       -E -R50 -G058 -V091
+mus_victory_wild.mid:          -E -R50 -G025 -V080
+mus_vs_aqua_magma_leader.mid:  -E -R50 -G126 -V080 -P1
+mus_vs_aqua_magma.mid:         -E -R50 -G118 -V080 -P1
+mus_vs_champion.mid:           -E -R50 -G121 -V080 -P1
+mus_vs_elite_four.mid:         -E -R50 -G125 -V080 -P1
+mus_vs_frontier_brain.mid:     -E -R50 -G115 -V090 -P1
+mus_vs_gym_leader.mid:         -E -R50 -G120 -V080 -P1
+mus_vs_kyogre_groudon.mid:     -E -R50 -G123 -V080 -P1
+mus_vs_mew.mid:                -E -R50 -G116 -V090
+mus_vs_rayquaza.mid:           -E -R50 -G114 -V080 -P1
+mus_vs_regi.mid:               -E -R50 -G122 -V080 -P1
+mus_vs_rival.mid:              -E -R50 -G124 -V080 -P1
+mus_vs_trainer.mid:            -E -R50 -G119 -V080 -P1
+mus_vs_wild.mid:               -E -R50 -G117 -V080 -P1
+mus_weather_groudon.mid:       -E -R50 -G090 -V050
+ph_choice_blend.mid:           -E -G130 -P4
+ph_choice_held.mid:            -E -G130 -P4
+ph_choice_solo.mid:            -E -G130 -P4
+ph_cloth_blend.mid:            -E -G130 -P4
+ph_cloth_held.mid:             -E -G130 -P4
+ph_cloth_solo.mid:             -E -G130 -P4
+ph_cure_blend.mid:             -E -G130 -P4
+ph_cure_held.mid:              -E -G130 -P4
+ph_cure_solo.mid:              -E -G130 -P4
+ph_dress_blend.mid:            -E -G130 -P4
+ph_dress_held.mid:             -E -G130 -P4
+ph_dress_solo.mid:             -E -G130 -P4
+ph_face_blend.mid:             -E -G130 -P4
+ph_face_held.mid:              -E -G130 -P4
+ph_face_solo.mid:              -E -G130 -P4
+ph_fleece_blend.mid:           -E -G130 -P4
+ph_fleece_held.mid:            -E -G130 -P4
+ph_fleece_solo.mid:            -E -G130 -P4
+ph_foot_blend.mid:             -E -G130 -P4
+ph_foot_held.mid:              -E -G130 -P4
+ph_foot_solo.mid:              -E -G130 -P4
+ph_goat_blend.mid:             -E -G130 -P4
+ph_goat_held.mid:              -E -G130 -P4
+ph_goat_solo.mid:              -E -G130 -P4
+ph_goose_blend.mid:            -E -G130 -P4
+ph_goose_held.mid:             -E -G130 -P4
+ph_goose_solo.mid:             -E -G130 -P4
+ph_kit_blend.mid:              -E -G130 -P4
+ph_kit_held.mid:               -E -G130 -P4
+ph_kit_solo.mid:               -E -G130 -P4
+ph_lot_blend.mid:              -E -G130 -P4
+ph_lot_held.mid:               -E -G130 -P4
+ph_lot_solo.mid:               -E -G130 -P4
+ph_mouth_blend.mid:            -E -G130 -P4
+ph_mouth_held.mid:             -E -G130 -P4
+ph_mouth_solo.mid:             -E -G130 -P4
+ph_nurse_blend.mid:            -E -G130 -P4
+ph_nurse_held.mid:             -E -G130 -P4
+ph_nurse_solo.mid:             -E -G130 -P4
+ph_price_blend.mid:            -E -G130 -P4
+ph_price_held.mid:             -E -G130 -P4
+ph_price_solo.mid:             -E -G130 -P4
+ph_strut_blend.mid:            -E -G130 -P4
+ph_strut_held.mid:             -E -G130 -P4
+ph_strut_solo.mid:             -E -G130 -P4
+ph_thought_blend.mid:          -E -G130 -P4
+ph_thought_held.mid:           -E -G130 -P4
+ph_thought_solo.mid:           -E -G130 -P4
+ph_trap_blend.mid:             -E -G130 -P4
+ph_trap_held.mid:              -E -G130 -P4
+ph_trap_solo.mid:              -E -G130 -P4
+se_a.mid:                      -E -R50 -G128 -V095 -P4
+se_applause.mid:               -E -R50 -G128 -V100 -P5
+se_arena_timeup1.mid:          -E -R50 -G129 -P5
+se_arena_timeup2.mid:          -E -R50 -G129 -P5
+se_ball_bounce_1.mid:          -E -R50 -G128 -V100 -P4
+se_ball_bounce_2.mid:          -E -R50 -G128 -V100 -P4
+se_ball_bounce_3.mid:          -E -R50 -G128 -V100 -P4
+se_ball_bounce_4.mid:          -E -R50 -G128 -V100 -P4
+se_ball_open.mid:              -E -R50 -G127 -V100 -P5
+se_ball_throw.mid:             -E -R50 -G128 -V120 -P5
+se_ball_trade.mid:             -E -R50 -G127 -V100 -P5
+se_ball_tray_ball.mid:         -E -R50 -G128 -V110 -P5
+se_ball_tray_enter.mid:        -E -R50 -G128 -V110 -P5
+se_ball_tray_exit.mid:         -E -R50 -G127 -V100 -P5
+se_ball.mid:                   -E -R50 -G127 -V070 -P4
+se_balloon_blue.mid:           -E -R50 -G128 -V105 -P4
+se_balloon_red.mid:            -E -R50 -G128 -V105 -P4
+se_balloon_yellow.mid:         -E -R50 -G128 -V105 -P4
+se_bang.mid:                   -E -R50 -G128 -V110 -P4
+se_berry_blender.mid:          -E -R50 -G128 -V090 -P4
+se_bike_bell.mid:              -E -R50 -G128 -V090 -P4
+se_bike_hop.mid:               -E -R50 -G127 -V090 -P4
+se_boo.mid:                    -E -R50 -G127 -V110 -P4
+se_breakable_door.mid:         -E -R50 -G128 -V110 -P4
+se_bridge_walk.mid:            -E -R50 -G128 -V095 -P4
+se_card.mid:                   -E -R50 -G127 -V100 -P4
+se_click.mid:                  -E -R50 -G127 -V110 -P4
+se_contest_condition_lose.mid: -E -R50 -G127 -V110 -P4
+se_contest_curtain_fall.mid:   -E -R50 -G128 -V070 -P5
+se_contest_curtain_rise.mid:   -E -R50 -G128 -V070 -P5
+se_contest_heart.mid:          -E -R50 -G128 -V090 -P5
+se_contest_icon_change.mid:    -E -R50 -G128 -V110 -P5
+se_contest_icon_clear.mid:     -E -R50 -G128 -V090 -P5
+se_contest_mons_turn.mid:      -E -R50 -G128 -V090 -P5
+se_contest_place.mid:          -E -R50 -G127 -V110 -P4
+se_dex_search.mid:             -E -R50 -G127 -v100 -P5
+se_ding_dong.mid:              -E -R50 -G127 -V090 -P5
+se_door.mid:                   -E -R50 -G127 -V080 -P5
+se_downpour_stop.mid:          -E -R50 -G128 -V100 -P2
+se_downpour.mid:               -E -R50 -G128 -V100 -P2
+se_e.mid:                      -E -R50 -G128 -V120 -P4
+se_effective.mid:              -E -R50 -G127 -V110 -P5
+se_egg_hatch.mid:              -E -R50 -G128 -V120 -P5
+se_elevator.mid:               -E -R50 -G128 -V100 -P4
+se_escalator.mid:              -E -R50 -G128 -V100 -P4
+se_exit.mid:                   -E -R50 -G127 -V120 -P5
+se_exp_max.mid:                -E -R50 -G128 -V094 -P5
+se_exp.mid:                    -E -R50 -G127 -V080 -P5
+se_failure.mid:                -E -R50 -G127 -V120 -P4
+se_faint.mid:                  -E -R50 -G127 -V110 -P5
+se_fall.mid:                   -E -R50 -G128 -V110 -P4
+se_field_poison.mid:           -E -R50 -G127 -V110 -P5
+se_flee.mid:                   -E -R50 -G127 -V090 -P5
+se_fu_zaku.mid:                -E -R50 -G127 -V120 -P4
+se_glass_flute.mid:            -E -R50 -G128 -V105 -P5
+se_i.mid:                      -E -R50 -G128 -V120 -P4
+se_ice_break.mid:              -E -R50 -G128 -V100 -P4
+se_ice_crack.mid:              -E -R50 -G127 -V100 -P4
+se_ice_stairs.mid:             -E -R50 -G128 -V090 -P4
+se_intro_blast.mid:            -E -R50 -G127 -V100 -P5
+se_itemfinder.mid:             -E -R50 -G127 -V090 -P5
+se_lavaridge_fall_warp.mid:    -E -R50 -G127 -P4
+se_ledge.mid:                  -E -R50 -G127 -V100 -P4
+se_low_health.mid:             -E -R50 -G127 -V100 -P3
+se_m_bind.mid:                 -E -R50 -G128 -V100 -P4
+se_m_comet_punch.mid:          -E -R50 -G128 -V120 -P4
+se_m_cut.mid:                  -E -R50 -G128 -V120 -P4
+se_m_double_slap.mid:          -E -R50 -G128 -V110 -P4
+se_m_fire_punch.mid:           -E -R50 -G128 -V110 -P4
+se_m_fly.mid:                  -E -R50 -G128 -V110 -P4
+se_m_gust.mid:                 -E -R50 -G128 -V110 -P4
+se_m_gust2.mid:                -E -R50 -G128 -V110 -P4
+se_m_headbutt.mid:             -E -R50 -G128 -V110 -P4
+se_m_horn_attack.mid:          -E -R50 -G128 -V110 -P4
+se_m_jump_kick.mid:            -E -R50 -G128 -V110 -P4
+se_m_leer.mid:                 -E -R50 -G128 -V110 -P4
+se_m_mega_kick.mid:            -E -R50 -G128 -V090 -P4
+se_m_mega_kick2.mid:           -E -R50 -G128 -V110 -P4
+se_m_pay_day.mid:              -E -R50 -G128 -V095 -P4
+se_m_razor_wind.mid:           -E -R50 -G128 -V110 -P4
+se_m_razor_wind2.mid:          -E -R50 -G128 -V090 -P4
+se_m_sand_attack.mid:          -E -R50 -G128 -V110 -P4
+se_m_scratch.mid:              -E -R50 -G128 -V110 -P4
+se_m_swords_dance.mid:         -E -R50 -G128 -V100 -P4
+se_m_tail_whip.mid:            -E -R50 -G128 -V110 -P4
+se_m_take_down.mid:            -E -R50 -G128 -V105 -P4
+se_m_vicegrip.mid:             -E -R50 -G128 -V110 -P4
+se_m_wing_attack.mid:          -E -R50 -G128 -V105 -P4
+se_mud_ball.mid:               -E -R50 -G128 -V110 -P4
+se_mugshot.mid:                -E -R50 -G128 -V090 -P5
+se_n.mid:                      -E -R50 -G128 -P4
+se_not_effective.mid:          -E -R50 -G127 -V110 -P5
+se_note_a.mid:                 -E -R50 -G128 -V110 -P4
+se_note_b.mid:                 -E -R50 -G128 -V110 -P4
+se_note_c_high.mid:            -E -R50 -G128 -V110 -P4
+se_note_c.mid:                 -E -R50 -G128 -V110 -P4
+se_note_d.mid:                 -E -R50 -G128 -V110 -P4
+se_note_e.mid:                 -E -R50 -G128 -V110 -P4
+se_note_f.mid:                 -E -R50 -G128 -V110 -P4
+se_note_g.mid:                 -E -R50 -G128 -V110 -P4
+se_o.mid:                      -E -R50 -G128 -V120 -P4
+se_orb.mid:                    -E -R50 -G128 -V100 -P5
+se_pc_login.mid:               -E -R50 -G127 -V100 -P5
+se_pc_off.mid:                 -E -R50 -G127 -V100 -P5
+se_pc_on.mid:                  -E -R50 -G127 -V100 -P5
+se_pike_curtain_close.mid:     -E -R50 -G129 -P5
+se_pike_curtain_open.mid:      -E -R50 -G129 -P5
+se_pin.mid:                    -E -R50 -G127 -V060 -P4
+se_pokenav_call.mid:           -E -R50 -G129 -V120 -P5
+se_pokenav_hang_up.mid:        -E -R50 -G129 -V110 -P5
+se_pokenav_off.mid:            -E -R50 -G127 -V100 -P5
+se_pokenav_on.mid:             -E -R50 -G127 -V100 -P5
+se_puddle.mid:                 -E -R50 -G128 -V020 -P4
+se_rain_stop.mid:              -E -R50 -G128 -V080 -P2
+se_rain.mid:                   -E -R50 -G128 -V080 -P2
+se_repel.mid:                  -E -R50 -G127 -V090 -P4
+se_rg_bag_cursor.mid:          -E -R50 -G129 -P5
+se_rg_bag_pocket.mid:          -E -R50 -G129 -P5
+se_rg_ball_click.mid:          -E -R50 -G129 -V100 -P5
+se_rg_card_flip.mid:           -E -R50 -G129 -P5
+se_rg_card_flipping.mid:       -E -R50 -G129 -P5
+se_rg_card_open.mid:           -E -R50 -G129 -V112 -P5
+se_rg_deoxys_move.mid:         -E -R50 -G129 -V080 -P5
+se_rg_door.mid:                -E -R50 -G129 -V100 -P5
+se_rg_help_close.mid:          -E -R50 -G129 -V095 -P5
+se_rg_help_error.mid:          -E -R50 -G129 -V125 -P5
+se_rg_help_open.mid:           -E -R50 -G129 -V096 -P5
+se_rg_poke_jump_failure.mid:   -E -R50 -G127 -P5
+se_rg_poke_jump_success.mid:   -E -R50 -G128 -V110 -P5
+se_rg_shop.mid:                -E -R50 -G129 -V080 -P5
+se_rg_ss_anne_horn.mid:        -E -R50 -G129 -V096 -P5
+se_rotating_gate.mid:          -E -R50 -G128 -V090 -P4
+se_roulette_ball.mid:          -E -R50 -G128 -V110 -P2
+se_roulette_ball2.mid:         -E -R50 -G128 -V110 -P2
+se_save.mid:                   -E -R50 -G128 -V080 -P5
+se_select.mid:                 -E -R50 -G127 -V080 -P5
+se_shiny.mid:                  -E -R50 -G128 -V095 -P5
+se_ship.mid:                   -E -R50 -G127 -V075 -P4
+se_shop.mid:                   -E -R50 -G127 -V090 -P5
+se_sliding_door.mid:           -E -R50 -G128 -V095 -P4
+se_success.mid:                -E -R50 -G127 -V080 -P4
+se_sudowoodo_shake.mid:        -E -R50 -G129 -V077 -P5
+se_super_effective.mid:        -E -R50 -G127 -V110 -P5
+se_switch.mid:                 -E -R50 -G127 -V100 -P4
+se_taillow_wing_flap.mid:      -E -R50 -G128 -V105 -P5
+se_thunder.mid:                -E -R50 -G128 -V110 -P3
+se_thunder2.mid:               -E -R50 -G128 -V110 -P3
+se_thunderstorm_stop.mid:      -E -R50 -G128 -V080 -P2
+se_thunderstorm.mid:           -E -R50 -G128 -V080 -P2
+se_truck_door.mid:             -E -R50 -G128 -V110 -P4
+se_truck_move.mid:             -E -R50 -G128 -P4
+se_truck_stop.mid:             -E -R50 -G128 -P4
+se_truck_unload.mid:           -E -R50 -G127 -P4
+se_u.mid:                      -E -R50 -G128 -P4
+se_unlock.mid:                 -E -R50 -G128 -V100 -P4
+se_use_item.mid:               -E -R50 -G127 -V100 -P5
+se_vend.mid:                   -E -R50 -G128 -V110 -P4
+se_warp_in.mid:                -E -R50 -G127 -V090 -P4
+se_warp_out.mid:               -E -R50 -G127 -V090 -P4
--- a/gflib/bg.c
+++ b/gflib/bg.c
--- a/gflib/blit.c
+++ b/gflib/blit.c
--- a/gflib/dma3_manager.c
+++ b/gflib/dma3_manager.c
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -263,7 +263,7 @@ u16 GetRecordedCyclingRoadResults(void)

 void UpdateCyclingRoadState(void)
 {
-    if (gLastUsedWarp.mapNum == MAP_NUM(MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE) && gLastUsedWarp.mapGroup == MAP_GROUP(MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE))
+    if (gLastUsedWarp.mapNum == MAP_NUM(MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE) && gLastUsedWarp.mapGroup == MAP_GROUP(MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE))
        return;

    if (VarGet(VAR_CYCLING_CHALLENGE_STATE) == 2 || VarGet(VAR_CYCLING_CHALLENGE_STATE) == 3)
--- a/gflib/gpu_regs.c
+++ b/gflib/gpu_regs.c
--- a/gflib/io_reg.c
+++ b/gflib/io_reg.c
--- a/gflib/malloc.c
+++ b/gflib/malloc.c
--- a/src/mini_printf.c
+++ b/src/mini_printf.c
@@ -36,7 +36,7 @@
 #include "gba/types.h"
 #include "gba/defines.h"
 #include "config.h"
-#include "characters.h"
+#include "constants/characters.h"
 #include "string_util.h"

 #ifndef NDEBUG
--- a/gflib/sprite.c
+++ b/gflib/sprite.c
--- a/gflib/string_util.c
+++ b/gflib/string_util.c
--- a/gflib/text.c
+++ b/gflib/text.c
--- a/gflib/window.c
+++ b/gflib/window.c
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -1,10 +1,10 @@
 	.include "src/main.o"
-	.include "gflib/malloc.o"
-	.include "gflib/dma3_manager.o"
-	.include "gflib/gpu_regs.o"
-	.include "gflib/bg.o"
-	.include "gflib/text.o"
-	.include "gflib/sprite.o"
+	.include "src/malloc.o"
+	.include "src/dma3_manager.o"
+	.include "src/gpu_regs.o"
+	.include "src/bg.o"
+	.include "src/text.o"
+	.include "src/sprite.o"
 	.include "src/link.o"
 	.include "src/AgbRfu_LinkManager.o"
 	.include "src/link_rfu_3.o"
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -1,17 +1,17 @@
 	.space 0x8
 	.include "main.o"
-	@ ../gflib/bg.o
+	@ ../src/bg.o
 	.align 2
 gWindowTileAutoAllocEnabled:
 	.space 4
-    @ ../gflib/window.o
+	@ ../src/window.o
 	.align 4
 gTransparentTileNumber:
 	.space 1
 	.align 4
 gWindowBgTilemapBuffers:
 	.space 16
-    @ ../gflib/text.o
+	@ ../src/text.o
 	.align 4
 gFonts:
 	.space 4
@@ -24,7 +24,7 @@ gCurGlyph:
 	.align 2
 gTextFlags:
 	.space 4
-    @ ../gflib/sprite.o
+	@ ../src/sprite.o
 	.align 2
 gOamMatrixAllocBitmap:
 	.space 4
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1,10 +1,10 @@
-	.include "gflib/malloc.o"
+	.include "src/malloc.o"
 	.include "src/decompress.o"
 	.include "src/main.o"
-	.include "gflib/window.o"
-	.include "gflib/text.o"
-	.include "gflib/sprite.o"
-	.include "gflib/string_util.o"
+	.include "src/window.o"
+	.include "src/text.o"
+	.include "src/sprite.o"
+	.include "src/string_util.o"
 	.include "src/link.o"
 	.include "src/AgbRfu_LinkManager.o"
 	.include "src/link_rfu_3.o"
--- a/tools/jsonproc/jsonproc.cpp
+++ b/tools/jsonproc/jsonproc.cpp
@@ -1,4 +1,6 @@
 // jsonproc.cpp
+// jsonproc converts JSON data to an output file based on an Inja template. 
+// https://github.com/pantor/inja

 #include "jsonproc.h"

--- a/tools/mapjson/json11.cpp
+++ b/tools/mapjson/json11.cpp
@@ -33,7 +33,6 @@ using std::vector;
 using std::map;
 using std::make_shared;
 using std::initializer_list;
-using std::move;

 /* Helper for representing null - just a do-nothing struct, plus comparison
 * operators so the helpers in JsonValue work. We can't use nullptr_t because
@@ -149,7 +148,7 @@ protected:

    // Constructors
    explicit Value(const T &value) : m_value(value) {}
-    explicit Value(T &&value)      : m_value(move(value)) {}
+    explicit Value(T &&value)      : m_value(std::move(value)) {}

    // Get type tag
    Json::Type type() const override {
@@ -196,7 +195,7 @@ class JsonString final : public Value<Json::STRING, string> {
    const string &string_value() const override { return m_value; }
 public:
    explicit JsonString(const string &value) : Value(value) {}
-    explicit JsonString(string &&value)      : Value(move(value)) {}
+    explicit JsonString(string &&value)      : Value(std::move(value)) {}
 };

 class JsonArray final : public Value<Json::ARRAY, Json::array> {
@@ -204,7 +203,7 @@ class JsonArray final : public Value<Json::ARRAY, Json::array> {
    const Json & operator[](size_t i) const override;
 public:
    explicit JsonArray(const Json::array &value) : Value(value) {}
-    explicit JsonArray(Json::array &&value)      : Value(move(value)) {}
+    explicit JsonArray(Json::array &&value)      : Value(std::move(value)) {}
 };

 class JsonObject final : public Value<Json::OBJECT, Json::object> {
@@ -212,7 +211,7 @@ class JsonObject final : public Value<Json::OBJECT, Json::object> {
    const Json & operator[](const string &key) const override;
 public:
    explicit JsonObject(const Json::object &value) : Value(value) {}
-    explicit JsonObject(Json::object &&value)      : Value(move(value)) {}
+    explicit JsonObject(Json::object &&value)      : Value(std::move(value)) {}
 };

 class JsonNull final : public Value<Json::NUL, NullStruct> {
@@ -254,12 +253,12 @@ Json::Json(double value)               : m_ptr(make_shared<JsonDouble>(value)) {
 Json::Json(int value)                  : m_ptr(make_shared<JsonInt>(value)) {}
 Json::Json(bool value)                 : m_ptr(value ? statics().t : statics().f) {}
 Json::Json(const string &value)        : m_ptr(make_shared<JsonString>(value)) {}
-Json::Json(string &&value)             : m_ptr(make_shared<JsonString>(move(value))) {}
+Json::Json(string &&value)             : m_ptr(make_shared<JsonString>(std::move(value))) {}
 Json::Json(const char * value)         : m_ptr(make_shared<JsonString>(value)) {}
 Json::Json(const Json::array &values)  : m_ptr(make_shared<JsonArray>(values)) {}
-Json::Json(Json::array &&values)       : m_ptr(make_shared<JsonArray>(move(values))) {}
+Json::Json(Json::array &&values)       : m_ptr(make_shared<JsonArray>(std::move(values))) {}
 Json::Json(const Json::object &values) : m_ptr(make_shared<JsonObject>(values)) {}
-Json::Json(Json::object &&values)      : m_ptr(make_shared<JsonObject>(move(values))) {}
+Json::Json(Json::object &&values)      : m_ptr(make_shared<JsonObject>(std::move(values))) {}

 /* * * * * * * * * * * * * * * * * * * *
 * Accessors
@@ -357,7 +356,7 @@ struct JsonParser final {
     * Mark this parse as failed.
     */
    Json fail(string &&msg) {
-        return fail(move(msg), Json());
+        return fail(std::move(msg), Json());
    }

    template <typename T>
--- a/tools/mapjson/mapjson.cpp
+++ b/tools/mapjson/mapjson.cpp
@@ -30,6 +30,8 @@ using json11::Json;
 #include "mapjson.h"

 string version;
+// System directory separator
+string sep;

 string read_text_file(string filepath) {
    ifstream in_file(filepath);
@@ -195,7 +197,7 @@ string generate_map_events_text(Json map_data) {

    string mapName = json_to_string(map_data, "name");

-    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n";
+    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n\t.align 2\n\n";

    string objects_label, warps_label, coords_label, bgs_label;

@@ -330,13 +332,22 @@ string generate_map_events_text(Json map_data) {
    return text.str();
 }

-string get_directory_name(string filename) {
-    size_t dir_pos = filename.find_last_of("/\\");
+string strip_trailing_separator(string filename) {
+    if(filename.back() == '/' || filename.back() == '\\')
+        filename.pop_back();

+    return filename;
+}
+void infer_separator(string filename) {
+    size_t dir_pos = filename.find_last_of("/\\");
+    sep = filename[dir_pos];
+}
+string file_parent(string filename){
+    size_t dir_pos = filename.find_last_of("/\\");
    return filename.substr(0, dir_pos + 1);
 }

-void process_map(string map_filepath, string layouts_filepath) {
+void process_map(string map_filepath, string layouts_filepath, string output_dir) {
    string mapdata_err, layouts_err;

    string mapdata_json_text = read_text_file(map_filepath);
@@ -354,10 +365,10 @@ void process_map(string map_filepath, string layouts_filepath) {
    string events_text = generate_map_events_text(map_data);
    string connections_text = generate_map_connections_text(map_data);

-    string files_dir = get_directory_name(map_filepath);
-    write_text_file(files_dir + "header.inc", header_text);
-    write_text_file(files_dir + "events.inc", events_text);
-    write_text_file(files_dir + "connections.inc", connections_text);
+    string out_dir = strip_trailing_separator(output_dir).append(sep);
+    write_text_file(out_dir + "header.inc", header_text);
+    write_text_file(out_dir + "events.inc", events_text);
+    write_text_file(out_dir + "connections.inc", connections_text);
 }

 string generate_groups_text(Json groups_data) {
@@ -382,7 +393,7 @@ string generate_groups_text(Json groups_data) {
    return text.str();
 }

-string generate_connections_text(Json groups_data) {
+string generate_connections_text(Json groups_data, string include_path) {
    vector<Json> map_names;

    for (auto &group : groups_data["group_order"].array_items())
@@ -407,12 +418,12 @@ string generate_connections_text(Json groups_data) {
    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n";

    for (Json map_name : map_names)
-        text << "\t.include \"data/maps/" << json_to_string(map_name) << "/connections.inc\"\n";
+        text << "\t.include \"" << include_path << "/" <<  json_to_string(map_name) << "/connections.inc\"\n";

    return text.str();
 }

-string generate_headers_text(Json groups_data) {
+string generate_headers_text(Json groups_data, string include_path) {
    vector<string> map_names;

    for (auto &group : groups_data["group_order"].array_items())
@@ -424,12 +435,12 @@ string generate_headers_text(Json groups_data) {
    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n";

    for (string map_name : map_names)
-        text << "\t.include \"data/maps/" << map_name << "/header.inc\"\n";
+        text << "\t.include \"" << include_path << "/" << map_name << "/header.inc\"\n";

    return text.str();
 }

-string generate_events_text(Json groups_data) {
+string generate_events_text(Json groups_data, string include_path) {
    vector<string> map_names;

    for (auto &group : groups_data["group_order"].array_items())
@@ -438,17 +449,16 @@ string generate_events_text(Json groups_data) {

    ostringstream text;

-    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/map_groups.json\n@\n\n";
+    text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from " << include_path << "/map_groups.json\n@\n\n";

    for (string map_name : map_names)
-        text << "\t.include \"data/maps/" << map_name << "/events.inc\"\n";
+        text << "\t.include \"" << include_path << "/" << map_name << "/events.inc\"\n";

    return text.str();
 }

 string generate_map_constants_text(string groups_filepath, Json groups_data) {
-    string file_dir = get_directory_name(groups_filepath);
-    char dir_separator = file_dir.back();
+    string file_dir = file_parent(groups_filepath) + sep;

    ostringstream text;

@@ -466,7 +476,7 @@ string generate_map_constants_text(string groups_filepath, Json groups_data) {
        size_t max_length = 0;

        for (auto &map_name : groups_data[groupName].array_items()) {
-            string map_filepath = file_dir + json_to_string(map_name) + dir_separator + "map.json";
+            string map_filepath = file_dir + json_to_string(map_name) + sep + "map.json";
            string err_str;
            Json map_data = Json::parse(read_text_file(map_filepath), err_str);
            if (map_data == Json())
@@ -493,7 +503,11 @@ string generate_map_constants_text(string groups_filepath, Json groups_data) {
    return text.str();
 }

-void process_groups(string groups_filepath) {
+// Output paths are directories with trailing path separators
+void process_groups(string groups_filepath, string output_asm, string output_c) {
+    output_asm = strip_trailing_separator(output_asm); // Remove separator if existing.
+    output_c = strip_trailing_separator(output_c);
+
    string err;
    Json groups_data = Json::parse(read_text_file(groups_filepath), err);

@@ -501,19 +515,16 @@ void process_groups(string groups_filepath) {
        FATAL_ERROR("%s\n", err.c_str());

    string groups_text = generate_groups_text(groups_data);
-    string connections_text = generate_connections_text(groups_data);
-    string headers_text = generate_headers_text(groups_data);
-    string events_text = generate_events_text(groups_data);
+    string connections_text = generate_connections_text(groups_data, output_asm);
+    string headers_text = generate_headers_text(groups_data, output_asm);
+    string events_text = generate_events_text(groups_data, output_asm);
    string map_header_text = generate_map_constants_text(groups_filepath, groups_data);

-    string file_dir = get_directory_name(groups_filepath);
-    char s = file_dir.back();
-
-    write_text_file(file_dir + "groups.inc", groups_text);
-    write_text_file(file_dir + "connections.inc", connections_text);
-    write_text_file(file_dir + "headers.inc", headers_text);
-    write_text_file(file_dir + "events.inc", events_text);
-    write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "map_groups.h", map_header_text);
+    write_text_file(output_asm + sep + "groups.inc", groups_text);
+    write_text_file(output_asm + sep + "connections.inc", connections_text);
+    write_text_file(output_asm + sep + "headers.inc", headers_text);
+    write_text_file(output_asm + sep + "events.inc", events_text);
+    write_text_file(output_c + sep + "map_groups.h", map_header_text);
 }

 string generate_layout_headers_text(Json layouts_data) {
@@ -586,7 +597,10 @@ string generate_layouts_constants_text(Json layouts_data) {
    return text.str();
 }

-void process_layouts(string layouts_filepath) {
+void process_layouts(string layouts_filepath, string output_asm, string output_c) {
+    output_asm = strip_trailing_separator(output_asm).append(sep);
+    output_c = strip_trailing_separator(output_c).append(sep);
+
    string err;
    Json layouts_data = Json::parse(read_text_file(layouts_filepath), err);

@@ -597,12 +611,9 @@ void process_layouts(string layouts_filepath) {
    string layouts_table_text = generate_layouts_table_text(layouts_data);
    string layouts_constants_text = generate_layouts_constants_text(layouts_data);

-    string file_dir = get_directory_name(layouts_filepath);
-    char s = file_dir.back();
-
-    write_text_file(file_dir + "layouts.inc", layout_headers_text);
-    write_text_file(file_dir + "layouts_table.inc", layouts_table_text);
-    write_text_file(file_dir + ".." + s + ".." + s + "include" + s + "constants" + s + "layouts.h", layouts_constants_text);
+    write_text_file(output_asm + "layouts.inc", layout_headers_text);
+    write_text_file(output_asm + "layouts_table.inc", layouts_table_text);
+    write_text_file(output_c + "layouts.h", layouts_constants_text);
 }

 int main(int argc, char *argv[]) {
@@ -620,29 +631,40 @@ int main(int argc, char *argv[]) {
        FATAL_ERROR("ERROR: <mode> must be 'layouts', 'map', or 'groups'.\n");

    if (mode == "map") {
-        if (argc != 5)
-            FATAL_ERROR("USAGE: mapjson map <game-version> <map_file> <layouts_file>\n");
+        if (argc != 6)
+            FATAL_ERROR("USAGE: mapjson map <game-version> <map_file> <layouts_file> <output_dir>\n");

+        infer_separator(argv[3]);
        string filepath(argv[3]);
        string layouts_filepath(argv[4]);
+        string output_dir(argv[5]);

-        process_map(filepath, layouts_filepath);
+        process_map(filepath, layouts_filepath, output_dir);
    }
    else if (mode == "groups") {
-        if (argc != 4)
-            FATAL_ERROR("USAGE: mapjson groups <game-version> <groups_file>\n");
+        if (argc != 6)
+            FATAL_ERROR("USAGE: mapjson groups <game-version> <groups_file> <output_asm_dir> <output_c_dir>\n");

+        infer_separator(argv[3]);
        string filepath(argv[3]);
+        string output_asm(argv[4]);
+        string output_c(argv[5]);

-        process_groups(filepath);
+        process_groups(filepath, output_asm, output_c);
    }
    else if (mode == "layouts") {
-        if (argc != 4)
-            FATAL_ERROR("USAGE: mapjson layouts <game-version> <layouts_file>\n");
+        if (argc != 6)
+            FATAL_ERROR("USAGE: mapjson layouts <game-version> <layouts_file> <output_asm_dir> <output_c_dir>\n");

+        infer_separator(argv[3]);
        string filepath(argv[3]);
+        string output_asm(argv[4]);
+        string output_c(argv[5]);

-        process_layouts(filepath);
+        process_layouts(filepath, output_asm, output_c);
+    }
+    else {
+        FATAL_ERROR("ERROR: <mode> must be 'layouts', 'map', or 'groups'.\n");
    }

    return 0;
--- a/tools/preproc/asm_file.cpp
+++ b/tools/preproc/asm_file.cpp
@@ -26,7 +26,7 @@
 #include "char_util.h"
 #include "utf8.h"
 #include "string_parser.h"
-#include "../../gflib/characters.h"
+#include "../../include/constants/characters.h"
 #include "io.h"

 AsmFile::AsmFile(std::string filename, bool isStdin, bool doEnum) : m_filename(filename)
--- a/tools/scaninc/scaninc.cpp
+++ b/tools/scaninc/scaninc.cpp
@@ -24,6 +24,9 @@
 #include <queue>
 #include <set>
 #include <string>
+#include <iostream>
+#include <tuple>
+#include <fstream>
 #include "scaninc.h"
 #include "source_file.h"

@@ -38,15 +41,19 @@ bool CanOpenFile(std::string path)
    return true;
 }

-const char *const USAGE = "Usage: scaninc [-I INCLUDE_PATH] FILE_PATH\n";
+const char *const USAGE = "Usage: scaninc [-I INCLUDE_PATH] [-M DEPENDENCY_OUT_PATH] FILE_PATH\n";

 int main(int argc, char **argv)
 {
    std::queue<std::string> filesToProcess;
    std::set<std::string> dependencies;
+    std::set<std::string> dependencies_includes;

    std::vector<std::string> includeDirs;

+    bool makeformat = false;
+    std::string make_outfile;
+
    argc--;
    argv++;

@@ -68,6 +75,13 @@ int main(int argc, char **argv)
            }
            includeDirs.push_back(includeDir);
        }
+        else if(arg.substr(0, 2) == "-M")
+        {
+            makeformat = true;
+            argc--;
+            argv++;
+            make_outfile = std::string(argv[0]);
+        }
        else
        {
            FATAL_ERROR(USAGE);
@@ -111,7 +125,13 @@ int main(int argc, char **argv)
            if (!exists && (file.FileType() == SourceFileType::Asm || file.FileType() == SourceFileType::Inc))
            {
                path = include;
+                if (CanOpenFile(path))
+                    exists = true;
            }
+            if (!exists)
+                continue;
+
+            dependencies_includes.insert(path);
            bool inserted = dependencies.insert(path).second;
            if (inserted && exists)
            {
@@ -121,8 +141,36 @@ int main(int argc, char **argv)
        includeDirs.pop_back();
    }

-    for (const std::string &path : dependencies)
+    if(!makeformat)
    {
-        std::printf("%s\n", path.c_str());
+        for (const std::string &path : dependencies)
+        {
+            std::printf("%s\n", path.c_str());
+        }
+        std::cout << std::endl;
+    }
+    else
+    {
+        // Write out make rules to a file
+        std::ofstream output(make_outfile);
+
+        // Print a make rule for the object file
+        size_t ext_pos = make_outfile.find_last_of(".");
+        auto object_file = make_outfile.substr(0, ext_pos + 1) + "o";
+        output << object_file.c_str() << ": ";
+        for (const std::string &path : dependencies)
+        {
+            output << path << " ";
+        }
+
+        // Dependency list rule.
+        // Although these rules are identical, they need to be separate, else make will trigger the rule again after the file is created for the first time.
+        output << "\n" << make_outfile.c_str() << ": ";
+        for (const std::string &path : dependencies_includes)
+        {
+            output << path << " ";
+        }
+        output.flush();
+        output.close();
    }
 }