Do not require "extras" submodule to build

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "extras"]
-	path = extras
-	url = git://github.com/kanzure/pokemon-reverse-engineering-tools.git

INSTALL.md

@@ -1,65 +1,162 @@
-# Linux
+# Instructions
 
-	sudo apt-get install make git python2
+These instructions explain how to set up the tools required to build **pokered**, including [**rgbds**](https://github.com/gbdev/rgbds), which assembles the source files into a ROM.
 
-	sudo apt-get install byacc flex pkg-config libpng-dev
-	git clone https://github.com/rednex/rgbds
-	cd rgbds
-	sudo make install
-	cd ..
+If you run into trouble, ask for help on IRC or Discord (see [README.md](README.md)).
 
-	git clone --recursive git://github.com/TheFakeMateo/rpp-backup.git
-	cd rpp-backup
 
-To build **pokered.gbc** and **pokeblue.gbc**:
+## Windows 10
+
+Download and install [**Windows Subsystem for Linux**](https://docs.microsoft.com/en-us/windows/wsl/install-win10). Then open the **WSL terminal**.
+
+Update WSL's software before continuing. If you chose Debian, Ubuntu, or another distribution that uses `apt-get`, then enter this command:
+
+```bash
+apt-get update && apt-get upgrade
+```
+
+WSL has its own file system that's not accessible from Windows, but Windows files *are* accessible from WSL. So you're going to want to install pokered within Windows. You'll have to change the **current working directory** every time you open WSL.
+
+For example, if you want to store pokered in **C:\Users\\*\<user>*\Desktop**, enter this command:
+
+```bash
+cd /mnt/c/Users/<user>/Desktop
+```
+
+(The Windows `C:\` drive is called `/mnt/c/` in WSL. Replace *\<user>* in the example path with your username.)
+
+If this works, then follow [the instructions for **Linux**](#linux) below for whatever distribution you installed for WSL.
+
+Otherwise, continue reading below for [the older Windows instructions](#windows).
+
+
+## Windows
+
+Download [**Cygwin**](http://cygwin.com/install.html): **setup-x86_64.exe** for 64-bit Windows, **setup-x86.exe** for 32-bit.
+
+Run setup and leave the default settings. At the "**Select Packages**" step, choose to install the following, all of which are in the "**Devel**" category:
+
+- `make`
+- `git`
+- `gcc-core`
+
+Double click on the text that says "**Skip**" next to each package to select the most recent version to install.
+
+Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install/windows) for Windows with Cygwin to install **rgbds 0.5.2**.
+
+**Note:** If you already have an older rgbds, you will need to update to 0.5.2. Ignore this if you have never installed rgbds before. If a version newer than 0.5.2 does not work, try downloading 0.5.2.
+
+Now open the **Cygwin terminal** and enter the following commands.
+
+Cygwin has its own file system that's within Windows, at **C:\cygwin64\home\\*\<user>***. If you don't want to store pokered there, you'll have to change the **current working directory** every time you open Cygwin.
+
+For example, if you want to store pokered in **C:\Users\\*\<user>*\Desktop**:
+
+```bash
+cd /cygdrive/c/Users/<user>/Desktop
+```
 
-	make
+(The Windows `C:\` drive is called `/cygdrive/c/` in Cygwin. Replace *\<user>* in the example path with your username.)
 
-To build them individually:
+Now you're ready to [build **pokered**](#build-pokered).
 
-	make red
-	make blue
 
+## macOS
 
-# Mac
+Install [**Homebrew**](https://brew.sh/). Follow the official instructions.
 
-Get [**Homebrew**](http://brew.sh/).
+Open **Terminal** and prepare to enter commands.
 
-Then in **Terminal**, run:
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/macos) for macOS to install **rgbds 0.5.2**.
 
-	xcode-select --install
-	brew install rgbds
+Now you're ready to [build **pokered**](#build-pokered).
 
-	git clone --recursive git://github.com/TheFakeMateo/rpp-backup.git
-	cd rpp-backup
 
-	make
+## Linux
 
+Open **Terminal** and enter the following commands, depending on which distro you're using.
 
+### Debian or Ubuntu
 
-# Windows
+To install the software required for **pokered**:
 
-It is probably easiest to just follow [**This Video Tutorial**](https://www.youtube.com/watch?v=fYytG7IUUWg).
-Just use this project's url instead of the vanilla Pokered url.
+```bash
+sudo apt-get install make gcc git
+```
 
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source.
 
-Original instructions are below:
+### OpenSUSE
 
-To build on Windows, use [**Cygwin**](http://cygwin.com/install.html) (64-bit). Use the default settings.
+To install the software required for **pokered**:
+
+```bash
+sudo zypper install make gcc git
+```
+
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source.
+
+### Arch Linux
+
+To install the software required for **pokered**:
+
+```bash
+sudo pacman -S make gcc git
+```
+
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/arch) for Arch Linux to install **rgbds 0.5.2**.
+
+If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source.
+
+### Termux
+
+To install the software required for **pokered**:
+
+```bash
+sudo apt install make clang git sed
+```
+
+To install **rgbds**:
+
+```bash
+sudo apt install rgbds
+```
+
+If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source.
+
+### Other distros
+
+If your distro is not listed here, try to find the required software in its repositories:
 
-In the installer, select the following packages:
 - `make`
+- `gcc` (or `clang`)
 - `git`
-- `python2`
+- `rgbds`
+
+If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.5.2** from source.
+
+Now you're ready to the rom(s).
+
+
+## Build Red++ v3
+
+To download the source files:
+
+```bash
+git clone https://github.com/JustRegularLuna/rpp-backup
+cd rpp-backup
+```
+
+To build **pokered.gbc** and **pokeblue.gbc**:
 
-Then download [**rgbds**](https://github.com/bentley/rgbds/releases).
-Extract the archive. Inside should be `rgbasm.exe`, `rgblink.exe`, `rgbfix.exe`, `rgbgfx.exe` and some `.dll` files. Put each file in `C:\cygwin64\usr\local\bin\`. If your Cygwin installation directory differs, ensure the `bin` directory is present in the PATH variable.
+```bash
+make
+```
 
-In the **Cygwin terminal**:
+### Build with a local rgbds version
 
-	git clone --recursive https://github.com/TheFakeMateo/rpp-backup.git
-	cd rpp-backup
+If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.5.2 globally. Instead, you can put its files in a directory within pokered, such as `pokered/rgbds-0.5.2/`. Then specify it when you run `make`:
 
-	make
-	
-"pokered.gbc" will be the "Normal" version and "pokeblue.gbc" will be the "Hard" version.
+```bash
+make RGBDS=rgbds-0.5.2/
+```

Makefile

@@ -4,23 +4,14 @@ else
 RGBDS_DIR =
 endif
 
-PYTHON := python2
-MD5 := md5sum -c --quiet
-
-2bpp     := $(PYTHON) extras/pokemontools/gfx.py 2bpp
-1bpp     := $(PYTHON) extras/pokemontools/gfx.py 1bpp
-pic      := $(PYTHON) extras/pokemontools/pic.py compress
-includes := $(PYTHON) extras/pokemontools/scan_includes.py
+MD5 := md5sum -c
 
 pokered_obj := audio_red.o main_red.o text_red.o wram_red.o
 pokeblue_obj := audio_blue.o main_blue.o text_blue.o wram_blue.o
 
 .SUFFIXES:
-.SUFFIXES: .asm .o .gbc .png .2bpp .1bpp .pic
 .SECONDEXPANSION:
-# Suppress annoying intermediate file deletion messages.
-.PRECIOUS: %.2bpp
-.PHONY: all clean red blue compare
+.PHONY: all clean red blue compare tools
 
 roms := pokered.gbc pokeblue.gbc
 
@@ -35,14 +26,27 @@ compare: red blue
 clean:
 	rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym)
 	find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} +
+	#$(MAKE) clean -C tools/
+
+tools:
+	$(MAKE) -C tools/
+
+
+# Build tools when building the rom.
+# This has to happen before the rules are processed, since that's when scan_includes is run.
+ifeq (,$(filter clean tools,$(MAKECMDGOALS)))
+$(info $(shell $(MAKE) -C tools))
+endif
+
+
 
 %.asm: ;
 
-%_red.o: dep = $(shell $(includes) $(@D)/$*.asm)
+%_red.o: dep = $(shell tools/scan_includes $(@D)/$*.asm)
 $(pokered_obj): %_red.o: %.asm $$(dep)
 	$(RGBDS_DIR)rgbasm -D _RED -h -o $@ $*.asm
 
-%_blue.o: dep = $(shell $(includes) $(@D)/$*.asm)
+%_blue.o: dep = $(shell tools/scan_includes $(@D)/$*.asm)
 $(pokeblue_obj): %_blue.o: %.asm $$(dep)
 	$(RGBDS_DIR)rgbasm -D _BLUE -h -o $@ $*.asm
 
@@ -54,7 +58,26 @@ pokeblue_opt = -Cjv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED"
 	$(RGBDS_DIR)rgbfix $($*_opt) $@
 	sort $*.sym -o $*.sym
 
-%.png:  ;
-%.2bpp: %.png  ; $(2bpp) $<
-%.1bpp: %.png  ; $(1bpp) $<
-%.pic:  %.2bpp ; $(pic)  $<
+gfx/blue/intro_purin_1.6x6.2bpp: rgbgfx += -h
+gfx/blue/intro_purin_2.6x6.2bpp: rgbgfx += -h
+gfx/blue/intro_purin_3.6x6.2bpp: rgbgfx += -h
+gfx/red/intro_nido_1.6x6.2bpp: rgbgfx += -h
+gfx/red/intro_nido_2.6x6.2bpp: rgbgfx += -h
+gfx/red/intro_nido_3.6x6.2bpp: rgbgfx += -h
+
+gfx/game_boy.norepeat.2bpp: tools/gfx += --remove-duplicates
+gfx/theend.interleave.2bpp: tools/gfx += --interleave --png=$<
+gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace
+
+%.png: ;
+
+%.2bpp: %.png
+	rgbgfx $(rgbgfx) -o $@ $<
+	$(if $(tools/gfx),\
+		tools/gfx $(tools/gfx) -o $@ $@)
+%.1bpp: %.png
+	rgbgfx -d1 $(rgbgfx) -o $@ $<
+	$(if $(tools/gfx),\
+		tools/gfx $(tools/gfx) -d1 -o $@ $@)
+%.pic:  %.2bpp
+	tools/pkmncompress $< $@

data/mapHeaders/FarawayIslandInside.asm

@@ -3,4 +3,4 @@ FarawayIslandInside_h:
 	db FARAWAY_ISLAND_INSIDE_HEIGHT, FARAWAY_ISLAND_INSIDE_WIDTH ; dimensions (y, x)
 	dw FarawayIslandInsideBlocks, FarawayIslandInsideTextPointers, FarawayIslandInsideScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw FarawayIslandInsideObject ; objects
+	dw FarawayIslandInsideObject ; objects

data/mapHeaders/FarawayIslandOutside.asm

@@ -3,4 +3,4 @@ FarawayIslandOutside_h:
 	db FARAWAY_ISLAND_OUTSIDE_HEIGHT, FARAWAY_ISLAND_OUTSIDE_WIDTH ; dimensions (y, x)
 	dw FarawayIslandOutsideBlocks, FarawayIslandOutsideTextPointers, FarawayIslandOutsideScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw FarawayIslandOutsideObject ; objects
+	dw FarawayIslandOutsideObject ; objects

data/mapHeaders/NavelRockOutside.asm

@@ -3,4 +3,4 @@ NavelRockOutside_h:
 	db NAVEL_ROCK_OUTSIDE_HEIGHT, NAVEL_ROCK_OUTSIDE_WIDTH ; dimensions (y, x)
 	dw NavelRockOutsideBlocks, NavelRockOutsideTextPointers, NavelRockOutsideScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw NavelRockOutsideObject ; objects
+	dw NavelRockOutsideObject ; objects

data/mapHeaders/SouthernIslandInside.asm

@@ -3,4 +3,4 @@ SouthernIslandInside_h:
 	db SOUTHERN_ISLAND_INSIDE_HEIGHT, SOUTHERN_ISLAND_INSIDE_WIDTH ; dimensions (y, x)
 	dw SouthernIslandInsideBlocks, SouthernIslandInsideTextPointers, SouthernIslandInsideScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw SouthernIslandInsideObject ; objects
+	dw SouthernIslandInsideObject ; objects

data/mapHeaders/SouthernIslandOutside.asm

@@ -3,4 +3,4 @@ SouthernIslandOutside_h:
 	db SOUTHERN_ISLAND_OUTSIDE_HEIGHT, SOUTHERN_ISLAND_OUTSIDE_WIDTH ; dimensions (y, x)
 	dw SouthernIslandOutsideBlocks, SouthernIslandOutsideTextPointers, SouthernIslandOutsideScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw SouthernIslandOutsideObject ; objects
+	dw SouthernIslandOutsideObject ; objects

data/mapObjects/FarawayIslandInside.asm

@@ -12,4 +12,4 @@ FarawayIslandInsideObject:
 
 	; warp-to
 	EVENT_DISP FARAWAY_ISLAND_INSIDE_WIDTH, $13, $c ; FARAWAY_ISLAND_OUTSIDE
-	EVENT_DISP FARAWAY_ISLAND_INSIDE_WIDTH, $13, $d ; FARAWAY_ISLAND_OUTSIDE
+	EVENT_DISP FARAWAY_ISLAND_INSIDE_WIDTH, $13, $d ; FARAWAY_ISLAND_OUTSIDE

data/mapObjects/FarawayIslandOutside.asm

@@ -16,4 +16,4 @@ FarawayIslandOutsideObject:
 	; warp-to
 	EVENT_DISP FARAWAY_ISLAND_OUTSIDE_WIDTH, $27, $e ; INSIDE_FERRY
 	EVENT_DISP FARAWAY_ISLAND_OUTSIDE_WIDTH, $7, $16 ; FARAWAY_ISLAND_INSIDE
-	EVENT_DISP FARAWAY_ISLAND_OUTSIDE_WIDTH, $7, $17 ; FARAWAY_ISLAND_INSIDE
+	EVENT_DISP FARAWAY_ISLAND_OUTSIDE_WIDTH, $7, $17 ; FARAWAY_ISLAND_INSIDE

data/mapObjects/NavelRockOutside.asm

@@ -14,4 +14,4 @@ NavelRockOutsideObject:
 	; warp-to
 	EVENT_DISP NAVEL_ROCK_OUTSIDE_WIDTH, $5, $8 ; NAVEL_ROCK_CAVE_1
 	EVENT_DISP NAVEL_ROCK_OUTSIDE_WIDTH, $b, $9 ; NAVEL_ROCK_FERRY_DOCK
-	EVENT_DISP NAVEL_ROCK_OUTSIDE_WIDTH, $b, $a ; NAVEL_ROCK_FERRY_DOCK
+	EVENT_DISP NAVEL_ROCK_OUTSIDE_WIDTH, $b, $a ; NAVEL_ROCK_FERRY_DOCK

data/mapObjects/SouthernIslandInside.asm

@@ -14,4 +14,4 @@ SouthernIslandInsideObject:
 
 	; warp-to
 	EVENT_DISP SOUTHERN_ISLAND_INSIDE_WIDTH, $15, $c ; SOUTHERN_ISLAND_OUTSIDE
-	EVENT_DISP SOUTHERN_ISLAND_INSIDE_WIDTH, $15, $d ; SOUTHERN_ISLAND_OUTSIDE
+	EVENT_DISP SOUTHERN_ISLAND_INSIDE_WIDTH, $15, $d ; SOUTHERN_ISLAND_OUTSIDE

data/mapObjects/SouthernIslandOutside.asm

@@ -16,4 +16,4 @@ SouthernIslandOutsideObject:
 	; warp-to
 	EVENT_DISP SOUTHERN_ISLAND_OUTSIDE_WIDTH, $17, $e ; INSIDE_FERRY
 	EVENT_DISP SOUTHERN_ISLAND_OUTSIDE_WIDTH, $5, $e ; SOUTHERN_ISLAND_INSIDE
-	EVENT_DISP SOUTHERN_ISLAND_OUTSIDE_WIDTH, $5, $f ; SOUTHERN_ISLAND_INSIDE
+	EVENT_DISP SOUTHERN_ISLAND_OUTSIDE_WIDTH, $5, $f ; SOUTHERN_ISLAND_INSIDE

tools/.gitignore

@@ -0,0 +1,3 @@
+scan_includes
+gfx
+pkmncompress

tools/Makefile

@@ -0,0 +1,16 @@
+.PHONY: all clean
+
+CC := gcc
+CFLAGS := -O3 -std=c99 -Wall -Wextra -pedantic
+
+tools := scan_includes gfx pkmncompress
+
+all: $(tools)
+	@:
+
+clean:
+	rm -f $(tools)
+
+gfx: common.h
+%: %.c
+	$(CC) $(CFLAGS) -o $@ $<