Sync with pokered

.gitattributes

@@ -10,9 +10,8 @@
 *.2bpp binary
 *.1bpp binary
 *.rle binary
-*.tilecoll binary
 *.bst binary
-*.map binary
+*.tilemap binary
 *.wav binary
 *.blk binary
 *.pic binary

.gitignore

@@ -1,59 +1,33 @@
-# precompiled python
-*.pyc
-
-# compiled object file
+# compiled objects
 *.o
 
-# no binaries
-*.exe
+# compiled graphics
+*.1bpp
+*.2bpp
+*.pic
 
-# roms
+# compiled roms
 *.gbc
 *.gb
 
 # rgbds extras
+*.map
 *.sym
 
-# converted image data
-*.2bpp
-*.1bpp
-*.pic
+# tool binaries
+*.exe
+
+# precompiled python
+*.pyc
+*$py.class
 
 # converted audio data
 *.pcm
 
-# swap files for vim
-.*.swp
-
-# no data from extras/
-*.json
-
-# for any of the poor souls with save game files in their working directory
+# save game files
 *.sgm
 *.sav
-*.sys
-
-# lol bgb
-*.sn1
-*.sn2
-*.sn3
-*.sn4
-*.sn5
-*.sn6
-*.sn7
-*.sn8
-*.sn9
-*.sn0
-
-# replace.sh
-replace.sh
-
-# leftover txt files from diff
-*.txt
-
-# for vim configuration
-# url: http://www.vim.org/scripts/script.php?script_id=441
-.lvimrc
-
-# extras is a submodule, don't include
-extras/
+*.rtc
+*.sn*
+*.sa*
+*.sg1

.travis.yml

@@ -1,14 +1,14 @@
 language: c
+os:
+  - linux
+  - osx
 install:
   - |-
-    path="$(pwd)"; cd;
-    wget https://github.com/rednex/rgbds/archive/v0.3.3.tar.gz -O rgbds.tar.gz &&
-    tar xf rgbds.tar.gz &&
-    cd rgbds-0.3.3 &&
-    sudo make install &&
-    cd - &&
-    rm -rf rgbds &&
-    cd "$path"
+    ( cd
+        git clone -b v0.4.1 --depth=1 https://github.com/gbdev/rgbds
+        sudo make -C rgbds install
+        rm -rf rgbds
+    )
 before_script:
   - |-
     function check_status() {
@@ -19,6 +19,10 @@ before_script:
       fi;
     }
 script:
-  - make -j2
-  - make compare
+  - make DEBUG=1 -j2 compare
   - check_status
+after_success:
+  - |-
+    if [ "$TRAVIS_BRANCH" = master -a "$TRAVIS_PULL_REQUEST" = false -a "$TRAVIS_OS_NAME" = linux ]; then
+      ./.travis/webhook.sh
+    fi

.travis/webhook.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+root="$(readlink -e "$(dirname "$0")/..")"
+
+# Report unnamed symbols
+content="$("$root/tools/unnamed.py" -r "$root" "$root/pokeyellow.sym" | head)"
+
+curl -H 'Content-Type: application/json' -X POST "$POKERED_DISCORD_WEBHOOK_URL" -d@- << EOF
+{
+    "username": "$POKERED_DISCORD_WEBHOOK_USERNAME",
+    "avatar_url": "$POKERED_DISCORD_WEBHOOK_AVATAR_URL",
+    "content": "\`\`\`$(echo "$content" | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')\`\`\`"
+}
+EOF

INSTALL.md

@@ -1,56 +1,155 @@
-# Linux
+# Instructions
 
-	sudo apt-get install make git gcc python
+These instructions explain how to set up the tools required to build **pokeyellow**, 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 https://github.com/pret/pokeyellow
-	cd pokeyellow
 
-To build **pokeyellow.gbc**:
+## Windows 10
 
-	make
+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:
 
-# Mac
+```bash
+apt-get update && apt-get upgrade
+```
 
-Get [**Homebrew**](http://brew.sh/).
+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 pokeyellow within Windows. You'll have to change the **current working directory** every time you open WSL.
 
-Then in **Terminal**, run:
+For example, if you want to store pokeyellow in **C:\Users\\*\<user>*\Desktop**, enter this command:
 
-	xcode-select --install
-	brew install rgbds
+```bash
+cd /mnt/c/Users/<user>/Desktop
+```
 
-	git clone https://github.com/pret/pokeyellow
-	cd pokeyellow
+(The Windows `C:\` drive is called `/mnt/c/` in WSL. Replace *\<user>* in the example path with your username.)
 
-To build **pokeyellow.gbc**:
+If this works, then follow [the instructions for **Linux**](#linux) below for whatever distribution you installed for WSL.
 
-	make
+Otherwise, continue reading below for [the older Windows instructions](#windows).
 
 
-# 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 "Select Packages", choose to install the following:
+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`
 - `python`
 
-Then download [**rgbds**](https://github.com/rednex/rgbds/releases/): the latest **win64.tar.gz** or **win32.tar.gz** release. Extract it and put all the `exe` and `dll` files individually in **C:\cygwin64\usr\local\bin**.
+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.4.1**.
+
+**Note:** If you already have an older rgbds, you will need to update to 0.4.1. Ignore this if you have never installed rgbds before. If a version newer than 0.4.1 does not work, try downloading 0.4.1.
+
+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 pokeyellow there, you'll have to change the **current working directory** every time you open Cygwin.
+
+For example, if you want to store pokeyellow in **C:\Users\\*\<user>*\Desktop**:
+
+```bash
+cd /cygdrive/c/Users/<user>/Desktop
+```
+
+(The Windows `C:\` drive is called `/cygdrive/c/` in Cygwin. Replace *\<user>* in the example path with your username.)
+
+Now you're ready to [build **pokeyellow**](#build-pokeyellow).
+
+
+## macOS
+
+Install [**Homebrew**](https://brew.sh/). Follow the official instructions.
+
+Open **Terminal** and prepare to enter commands.
+
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/macos) for macOS to install **rgbds 0.4.1**.
+
+Now you're ready to [build **pokeyellow**](#build-pokeyellow).
+
+
+## Linux
+
+Open **Terminal** and enter the following commands, depending on which distro you're using.
+
+### Debian or Ubuntu
+
+To install the software required for **pokeyellow**:
+
+```bash
+sudo apt-get install make gcc git
+```
+
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source.
+
+### OpenSUSE
+
+To install the software required for **pokeyellow**:
+
+```bash
+sudo zypper install make gcc git
+```
+
+Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source.
+
+### Arch Linux
+
+To install the software required for **pokeyellow**:
+
+```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.4.1**.
+
+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.4.1** from source.
+
+### Termux
+
+To install the software required for **pokeyellow**:
+
+```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.4.1** from source.
+
+### Other distros
+
+If your distro is not listed here, try to find the required software in its repositories:
+
+- `make`
+- `gcc` (or `clang`)
+- `git`
+- `rgbds`
+
+If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source.
+
+Now you're ready to [build **pokeyellow**](#build-pokeyellow).
+
+
+## Build pokeyellow
 
-In the **Cygwin terminal**, enter these commands:
+To download the **pokeyellow** source files:
 
-	git clone https://github.com/pret/pokeyellow
-	cd pokeyellow
+```bash
+git clone https://github.com/pret/pokeyellow
+cd pokeyellow
+```
 
 To build **pokeyellow.gbc**:
 
-	make
+```bash
+make
+```